Crash when resolving merge conflicts on unshelve
Created originally on Bitbucket by Anonymous
Workflow was basically.:
Shelve some current work Pull / update / merge with incoming changesets from server (1 outgoing changeset) Unshelve the just shelved work
Crash
I will speculate that what caused this particular crash dialog is that the shelved changeset included a file that had been deleted from the repo in the incoming changesets.
{{{ #!python ** Mercurial version (1.8.3). TortoiseHg version (2.0.4) ** Command: --nofork workbench ** CWD: E:\Development\Source\Hg\Steve.POC ** Extensions loaded: fixfrozenexts, convert, rebase, mq, fetch, mercurial_keyring ** 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.3 Traceback (most recent call last): File "tortoisehg\hgqt\shelve.pyo", line 228, in moveFilesLeft File "tortoisehg\hgqt\chunks.pyo", line 291, in mergeChunks File "tortoisehg\hgqt\chunks.pyo", line 135, in runPatcher File "tortoisehg\hgqt\rejects.pyo", line 97, in init TypeError: argument of type 'NoneType' is not iterable
}}}