Merge: Can't do a tool resolve

Issue #891 resolved
Mike Wilkes
created an issue

Unfortunately, all I get in the output is the following. No stack trace.

% hg resolve --repository C:\mwilkes\dev\scala\datagen\workspace -- C:\mwilkes\dev\scala\datagen\workspace\dgSample/pom.xml merging dgSample/pom.xml abort: The handle is invalid [command returned code 255 Tue Jul 05 20:23:03 2011]

Installed 2.1 over an existing 2.0.5 install. Using beyondcompare3 for my merge tool. Experienced this on both XP and Win7.

Let me know what I can do to dig into this if you can't reproduce.

I also tried changing the merge tool to kdiff3 and have same issue.

Comments (11)

  1. Steve Borho

    If I use thg.exe instead of thgw.exe, the resolve works.

    This looks like a regression in Mercurial 1.9

    This will hold up TortoiseHg 2.1.1 until it gets fixed.

  2. Mike Wilkes reporter

    If I do the resolve from a windows command line, it also works correctly.

    This is rather unfortunate, as I liked a number of the enhancements in 2.1.

  3. Log in to comment