status chokes on merged working copy

Issue #20 resolved
Steve Borho
created an issue

clicking on a file that was added by the 'other' revision results in:



Please report this bug to Mercurial version (1.6.4+134-338b4b615d33). TortoiseHg version (1.1.4+227-51000f098dc2) Command: CWD: C:\Windows Extensions loaded: fixfrozenexts, perfarce, convert, mercurial_keyring, bookmarks, mq, rebase, transplant, patchbomb, purge Python version: 2.6.5 (r265:79096, Mar 19 2010, 21:48:26) [MSC v.1500 32 bit (Intel)] Windows version: (6, 1, 7600, 2, '') Processor architecture: x64 Traceback (most recent call last): File "tortoisehg\hgqt\status.pyo", line 303, in rowSelected File "tortoisehg\hgqt\fileview.pyo", line 316, in displayFile File "tortoisehg\hgqt\fileview.pyo", line 530, in init File "tortoisehg\hgqt\fileview.pyo", line 666, in readStatus File "mercurial\context.pyo", line 84, in getitem File "mercurial\context.pyo", line 172, in filectx File "mercurial\context.pyo", line 161, in filenode File "mercurial\context.pyo", line 149, in _fileinfo LookupError: FOO@43c9773030c3: not found in manifest