Shelve crash on renamed file
Created originally on Bitbucket by dddinu (Dinu M)
#!python
** Mercurial version (3.5). TortoiseHg version (3.5)
** Command:
** CWD: /root
** Encoding: UTF-8
** Extensions loaded: strip, mq, rebase, shelve, transplant
** Python version: 2.7.5 (default, Jun 17 2014, 18:11:42) [GCC 4.8.2 20140120 (Red Hat 4.8.2-16)]
** System: Linux dev7.local 3.10.0-229.4.2.el7.x86_64 #1 SMP Wed May 13 10:06:09 UTC 2015 x86_64
** Qt-4.8.5 PyQt-4.10.1 QScintilla-2.8
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/shelve.py", line 220, in moveFileLeft
if chunks and self.browsea.mergeChunks(file, chunks):
File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/chunks.py", line 364, in mergeChunks
return self.runPatcher(fp, wfile, True)
File "/usr/lib/python2.7/site-packages/tortoisehg/hgqt/chunks.py", line 187, in runPatcher
eolmode=eolmode, similarity=0)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 2042, in internalpatch
return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 2027, in patchbackend
eolmode=eolmode)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 1878, in applydiff
prefix=prefix, eolmode=eolmode)
File "/usr/lib64/python2.7/site-packages/mercurial/patch.py", line 1924, in _applydiff
assert data is not None
AssertionError
Sequence of operations:
- create changeset involving one file being renamed
- shelve changeset
- switch to different branch
- unshelve changeset. Crashes when created the added (rename target) file.
There would have been no conflict if operation didn't crash.