SVN-like merging (contrib)

[Sébastien Pierre]

Le jeudi 11 mai 2006 à 18:57 +0200, Thomas Arendsen Hein a écrit :

> > If this is the case, then "parent/base/other" would be better.
> 
> No, that confuses me even more.
> 
> local = current = mine = the file in the working directory
> base = common ancestor of local and other
> other = remote = what should be the new version if I discard my changes

Ah, you're right : I thought that the external merge command was given
the parent revision of the file, local rev and other rev. While looking
at the hgmerge code makes it clear:

LOCAL="$1"
BASE="$2"
OTHER="$3"

So I will actually update the code to have "base/local/other" as you
suggested.

Thanks !

 -- Sébastien