Question

I’m trying to merge two branches together using mercurial and there are some conflicts. When working in Subversion, merge conflicts would result in the conflicted file being replaced by a unified diff, my own version of the file with the “.mine” extension added as well as the last checked in version of the file with the “.rxxx” extension added.

With mercurial, I only get the unified diff as well as my own version with the “.orig” extension added.

I’m used to editing the merges myself in my own time in eclipse using the “Compare With > Each Other” command or using FileMerge, however as the base revision is not available without manually going and fetching it I can’t work this way any more.

I do not want to perform the merging during the hg merge command – I prefer to do it in my own time.

Is there a setting or extension I can use to make this possible?

Answer 1

How about setting a merge tool that just saves the files mercurial is creating for the merge tool to operate on?

[ui]
merge = copy

[merge-tools]
copy.executable = /path/to/mycopy.sh
copy.args = $base $local $other $output

And then in mycopy.sh just do something like:

#!/bin/sh
cp $1 $4.base
cp $2 $4.mine
cp $3 $4.theirs

That should always succeed instantly and leave you with a .base a .mine and a .theirs for each file that conflicted. You can set that up once in your ~/.hgrc and be done with it.