Unhandled exception while attempting to restart merge with p4merge

Issue #747 resolved
Anonymous created an issue

The exception below popped up when I viewed the working directory during a merge and marked a previously auto-resolved file as unresolved and then selected the "restart merge with" -> "p4merge" option to try and manually fix the merge problem.

p4merge usually works fine for me, but I'm having trouble getting it to not auto-resolve this particular merge conflict, and that's what led me to this situation.



Mercurial version (1.8.3). TortoiseHg version (2.0.4) Command: CWD: C:\Windows Extensions loaded: fixfrozenexts, gestalt, kilnauth, kilnpath, big-push, kiln, caseguard, kbfiles, purge, mq, rebase, graphlog, churn, fetch, transplant Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)] Windows version: (6, 1, 7600, 2, '') Processor architecture: x64 Qt-4.7.1 PyQt-4.8.3 Traceback (most recent call last): File "tortoisehg\hgqt\wctxactions.pyo", line 89, in <lambda> File "tortoisehg\hgqt\wctxactions.pyo", line 349, in resolve_with File "mercurial\commands.pyo", line 3201, in resolve File "mercurial\cmdutil.pyo", line 270, in match File "mercurial\match.pyo", line 51, in init File "mercurial\match.pyo", line 272, in _normalize File "mercurial\util.pyo", line 344, in canonpath Abort: Shared/Shared/Shared.csproj not under root


Comments (7)

  1. Log in to comment