[PATCH 1 of 2] simplemerge: includes revision into merge marker of simplemerge

Laurens Holst laurens.nospam at grauw.nl
Thu Sep 27 06:24:38 CDT 2012

Hey Pierre-Yves,

Op 27-09-12 12:06, pierre-yves.david at logilab.fr schreef:
> With this changes they look like::
>    <<<<<<< local: 32e80765d7fe+
>    something else
>    =======
>    something
>    >>>>>>> other: 75234512624c
> The extra nodeid added refer to the last revision that touched the files in this
> "branch" of the merge. Such information should help to remove ambiguous about
> each side of the merge. For example in rebase: `local` is destination and
> `other` is rebased changesets. The only information added is the nodeid. This is
> a simple a short information that allows to retrieves all the other (revid,
> description, date, authors, etc).

A stupid small nit that I’m a little embarrassed to bother the list 
about :)...

I think it would look better if you omitted the colon.

Btw, definitely +1 on this, especially the addition of base commit 
information. I think it’s a more elegant solution that adding a second 
==== separator with the base code between.


More information about the Mercurial-devel mailing list