"underlying C/C++ object has been deleted" when doing "merge with local"
Created originally on Bitbucket by Anonymous
I pulled a branch but did not update, modified something in the working directory and was doing merge with "force merge with local". This failed, and I then had a merge dialog that said "Not a head revision!" but "Working directory status: Clean". Pressing "Merge" yielded: {{{ ... hg --repository ..... --tool=internal:fail 948(pulled rev) abort: nothing to merge (use 'hg update' or check 'hg heads') }}}
A couple of times I pressed "merge" again, and then got this message.
{{{ #!python ** Please report this bug to http://bitbucket.org/tortoisehg/thg/issues ** Mercurial version (1.8). TortoiseHg version (2.0) ** Command: --nofork workbench ** CWD: C:\projects\work\secretprojectname ** Extensions loaded: fixfrozenexts, 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.1 PyQt-4.8.2 Traceback (most recent call last): File "tortoisehg\hgqt\merge.pyo", line 533, in completed RuntimeError: underlying C/C++ object has been deleted
}}}