Issue #1505 resolved

Failure during merge of two branches

Andrew Sklyarevsky
created an issue

This message appeared when I tried to merge two branches (something like a 'stable' branch was being merged into default (which is 'development' branch in the repository in question), in order to merge a bugfix). TortoiseHg 2.2.1, under Windows 7. After Workbench restart, the merge completed just fine.

Hope this helps!

{{{

!python

Mercurial version (2.0.1). TortoiseHg version (2.2.1) Command: --nofork workbench CWD: C:\Projects\SomeProjectName\Sources Encoding: cp1251 Extensions loaded: mercurial_keyring, transplant, mq 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 465, in run File "mercurial\context.pyo", line 738, in status File "mercurial\localrepo.pyo", line 1364, in status File "mercurial\context.pyo", line 805, in flags File "mercurial\util.pyo", line 236, in get File "mercurial\context.pyo", line 669, in _flagfunc File "mercurial\dirstate.pyo", line 145, in flagfunc File "mercurial\context.pyo", line 652, in _buildflagfunc File "mercurial\context.pyo", line 94, in manifest File "mercurial\util.pyo", line 236, in get File "mercurial\context.pyo", line 64, in _manifest File "mercurial\util.pyo", line 236, in get File "mercurial\context.pyo", line 60, in _changeset File "mercurial\changelog.pyo", line 181, in read File "mercurial\revlog.pyo", line 865, in revision TypeError: 'NoneType' object is unsubscriptable

}}}

Comments (26)

  1. Steve Borho

    this could possibly be threading related.

        def __init__(self, repo, pctx, pats, opts, parent=None):
            super(StatusThread, self).__init__()
            self.repo = thgrepo.repository(repo.ui, repo.root)
    

    this gives the background thread a reference to the live thgrepo used by the UI. All badness.

  2. Anonymous

    Have the same error with a later version of mercurial/tortoisehg

    ** Mercurial version (2.0.2).  TortoiseHg version (2.2.2)
    ** Command: 
    ** CWD: C:\Work\hgICPSDK
    ** Encoding: cp1252
    ** Extensions loaded: purge, mq
    ** 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
    
  3. Log in to comment