[Bug 3862] New: merge failed with 'unknown exception encountered': 'KeyError: .hgsubstate'

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=3862

          Priority: normal
            Bug ID: 3862
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: merge failed with 'unknown exception encountered':
                    'KeyError: .hgsubstate'
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: dean.malmgren at datascopeanalytics.com
          Hardware: Macintosh
            Status: UNCONFIRMED
           Version: 2.5.1
         Component: Mercurial
           Product: Mercurial

Created attachment 1718
  --> http://bz.selenic.com/attachment.cgi?id=1718&action=edit
Error output from my attempted merge

A colleague on similar hardware, OS (Ubuntu 12.04.2), and hg version started to
merge two heads in a repo we share and decided to cancel the merge as there
were diffs that he wasn't familiar with so I told him I'd handle it. 

He then "hg push -f"-ed his repository onto a shared server, which I then "hg
pull"-ed only my local machine. Now that its on my local computer, I can't seem
to merge the changes and mercurial is throwing an awful error when I try to run
'hg merge' myself (see attached output). The strange thing is that everything
else appears to work just fine:

* I am able to successfully switch between the two heads without any problems. 

* I can run 'hg diff' between the two heads without any problems.

* I can run 'hg diff' on .hgsubstate between the two heads without any problems
(which would seemingly be the issue based on the KeyError). 

For what it is worth, I was able to merge the repositories on the shared server
I mentioned above. There was one file that triggered the merge tool to come up
but aside from that the merge went smoothly. The shared server has mercurial
version 2.1 and is on Ubuntu 10.04.4.

I'm not sure if this bug is repeatable, but I thought I would alert you to the
issue in case it triggers something more meaningful for he mercurial
development community. If there is anything I can do to help, please do not
hesitate to reach out; I will be as responsive as possible.

-- 
You are receiving this mail because:
You are on the CC list for the bug.