An error occurred when trying to merge
Created originally on Bitbucket by Anonymous
The following error occurred immediately after I selected merge. Before merging I had committed my changes, tried to push (forgot to pull first, so got a warning dialog about that), then pulled last changes and right clicked the tip and selected merge.
So far it seems I can just close this error dialog window and continue as if nothing happened. The merge was committed in the next step of the dialog. I then pushed and it was successful.
#!python
** Mercurial version (2.0.2). TortoiseHg version (2.2.2)
** Command:
** CWD: C:\Windows\system32
** 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