Error on clean merge

Issue #1712 duplicate
Steve Hoelzer
created an issue

I performed a merge with the TortoiseHg Workbench by right clicking on a rev and choosing "Merge with local...". It was a clean merge, but I got an error just before the last step. The merge did complete and everything seems fine now.

Stack trace below

================================================

{{{ #!python Mercurial version (2.0.2). TortoiseHg version (2.2.2) Command: -R C:\Actis6 CWD: C:\Actis6 Encoding: cp1252 Extensions loaded: Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:13:38) [MSC v.1500 64 bit (AMD64)] Windows version: (6, 1, 7601, 2, 'Service Pack 1') Processor architecture: x64 ** Qt-4.7.4 PyQt-4.8.6 Traceback (most recent call last): File "tortoisehg\hgqt\status.pyo", line 468, in run File "mercurial\context.pyo", line 738, in status File "mercurial\localrepo.pyo", line 1365, in status File "mercurial\context.pyo", line 805, in flags File "mercurial\util.pyo", line 239, in get File "mercurial\context.pyo", line 669, in _flagfunc File "mercurial\dirstate.pyo", line 150, in flagfunc File "mercurial\context.pyo", line 652, in _buildflagfunc File "mercurial\context.pyo", line 94, in manifest File "mercurial\util.pyo", line 239, in get File "mercurial\context.pyo", line 64, in _manifest File "mercurial\util.pyo", line 239, in get File "mercurial\context.pyo", line 60, in _changeset File "mercurial\changelog.pyo", line 192, in read File "mercurial\revlog.pyo", line 865, in revision TypeError: 'NoneType' object is unsubscriptable

}}}

Comments (2)

  1. Log in to comment