D3694: shelve: use more accurate description in conflict marker

This revision was automatically updated to reflect the committed changes. Closed by commit rHG9b077e5fa8ba: shelve: use more accurate description in conflict marker (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D3694: shelve: use more accurate description in conflict marker

lothiraldan updated this revision to Diff 9409. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3694?vs=8983=9409 REVISION DETAIL https://phab.mercurial-scm.org/D3694 AFFECTED FILES hgext/shelve.py tests/test-shelve.t CHANGE DETAILS diff --git

D3694: shelve: use more accurate description in conflict marker

lothiraldan added a comment. In https://phab.mercurial-scm.org/D3694#58409, @durin42 wrote: > In https://phab.mercurial-scm.org/D3694#58369, @lothiraldan wrote: > > > > How much work is this, do you have any idea? > > > > The first option (adding "reserved" phase) should be very

D3694: shelve: use more accurate description in conflict marker

durin42 added a comment. In https://phab.mercurial-scm.org/D3694#58369, @lothiraldan wrote: > > How much work is this, do you have any idea? > > The first option (adding "reserved" phase) should be very quick to implement. It might need minor adjustment for performance but I don't

D3694: shelve: use more accurate description in conflict marker

lothiraldan added a comment. In https://phab.mercurial-scm.org/D3694#58242, @durin42 wrote: > In https://phab.mercurial-scm.org/D3694#58241, @lothiraldan wrote: > > > > Interesting. I think I like this, it's a bummer that it requires a format bump in requires. > > > > > > > >

D3694: shelve: use more accurate description in conflict marker

durin42 added a comment. In https://phab.mercurial-scm.org/D3694#58241, @lothiraldan wrote: > > Interesting. I think I like this, it's a bummer that it requires a format bump in requires. > > > > - There are no format changes per-se, older client would preserve the phases for

D3694: shelve: use more accurate description in conflict marker

lothiraldan added a comment. > Interesting. I think I like this, it's a bummer that it requires a format bump in requires. - There are no format changes per-se, older client would preserve the phases for internal changesets, but have them visible, - This is also something we

D3694: shelve: use more accurate description in conflict marker

lothiraldan created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. REPOSITORY rHG Mercurial REVISION DETAIL