SVN-like merging

[Sébastien Pierre]

Le 06-05-06 à 09:11, Colin McMillen a écrit :

>> So does anybody find having copies of the original and newer files
>> useful ?
>
> I would find this incredibly useful. The current system hg uses is
> indeed very flexible, but the simple cases (like setting merge=kdiff3
> in .hgrc) are very brittle. If kdiff3 crashes (this has happened) or
> if the merge requires peeking at multiple conflicting files, it can be
> hard to tell what the heck actually happened.

It also seems like you cannot choose in which order you want to  
resolve conflicts, so this proposition would also solve this.

> So: I would find it very useful if you came up with a contrib script
> for doing this, and I would also highly suggest that such a script be
> used by hgmerge, either by default or (more likely) in the event that
> no merge utility is found (or diff+patch fails).

The script is almost ready. I think I will submit a version this monday.

  -- Sébastien