Merge woes

[Steve Borho]

On Wed, 2007-10-10 at 09:06 -0700, mercurial.9.pauldf at spamgourmet.com
wrote:
> I ran into a situation that's somewhat similar to the FAQ "My merge
> program failed, and now I don't know what to do".
> 
> I installed Mercurial for Windows, and was developing a small piece of
> code together with someone who was using Mercurial on his Linux box.
> However, it wasn't until I pulled some new code from his repository to
> merge it that I realized I didn't have a tool to set up a merge tool.

This is the primary reason I've started providing "Batteries Included"
Mercurial installers for Windows.  There's a functional merge setup out
of the box, along with a history browser and commit tool.

> At this point, he & I decided that the simplest thing was to do the
> merge on his side instead of my side.  The merge on his side went
> smoothly.
> 
> However, I was left with an unfinished merge in my tree, and I
> couldn't figure out how to back out of it.  I tried reverting.  I also
> tried pulling from his tree again to pick up the results of his merge.
>  In the end, I abandoned that tree, creating a new one (moving any
> local changes over if I had any).

All that should have been required was:
hg update -C REV

The merge failure message should have included this, though I haven't
run the case where no merge tool was found in some time.

-- 
Steve Borho (steve at ageia.com)
http://www.borho.org/~steve/steveAgeia.asc
Key fingerprint = 3D9C 67D5 F426 4322 075B  0795 C9B2 C3A0 97D0 C090