[PATCH 10 of 10] effectflag: detect when diff changed

Jun Wu quark at fb.com
Tue Jul 18 12:57:50 EDT 2017


Excerpts from Christophe de Vienne's message of 2017-07-18 15:12:10 +0200:
> Hello,
> 
> As a end-user I encountered some situations were having such information
> about changeset not available in my local repo would have help.
> 
> The main situation I recall is a colleague doing multiple amend or
> rebase of several changesets. On my side I had made other rebase &
> amends (lack of communication I guess) and pushed. When he pulled we
> ended up with several divergent changeset that were not trivial to sort.
> To solve the issue I pulled everything locally and had to compare the
> divergent changeset diffs one by one.
> 
> Having some more information about obsolete (and not available) cset in
> my repository would have help a lot to decide which version of the
> changeset to take. Like who did what (amend ? rebase ?).

The obsmarker has "user", "date", "operation" (disabled by default)
information already. We need to define templates to render them. I think
they will be available at 4.4 release.


More information about the Mercurial-devel mailing list