CODEWITHSUNDEEP
mercurial
Shabbyrobe
Shabbyrobe

Reputation: 12628

How to get mercurial to emit base revision of conflicted file as well as modified version?

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?

Upvotes: 4

Views: 624

Answers (4)

pyfunc
pyfunc

Reputation: 66739

You can set the HGMERGE environment variable.

Mercurial will usually attempt to merge the files using a simple merge algorithm first, to see if they can be merged without conflicts. Only if there are conflicting changes will hg actually execute the merge program.

You can set this to some GUI merge tool etc.

There are other options like internal:fail, internal:local, or internal:other

In hgrc:

[ui]
merge = your-merge-program

[merge-tools]
kdiff3.args = $base $local $other -o $output

So you should be able to specify merge program's arguments with all your needs. Probably, you can adopt this technique for Eclipse to be fired up.

To make merge fail immediately on conflict, try

export HGMERGE=false

In fact, if you want to know the conflict in advance, you could use the "preview" option for hg merge

-P --preview  review revisions to merge (no merge is performed)

Upvotes: 0

Martin Geisler
Martin Geisler

Reputation: 73808

We have a built-in merge tool for this called internal:dump. So with

[ui]
merge = internal:dump

you will be brought back to the good old Subversion-days, or something close to it.

Upvotes: 8

anton.burger
anton.burger

Reputation: 5706

Take a look at the hg resolve command. Once a merge has started, but before it's been committed, you can use resolve to list files with conflicts, as well as mark conflicts as resolved or unresolved, or restart the merging process, all at the granularity of individual files rather than changesets.

It doesn't give you the files you want (though see @Ry4an's answer), but it can fire up your merge tools for any particular file whenever you care to resolve it.

Upvotes: 1

Ry4an Brase
Ry4an Brase

Reputation: 78350

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.

Upvotes: 3

Related Questions