shelve: uncommitted merge with no revision specified
Created originally on Bitbucket by Anonymous
I was merging two branches, but have not committed the merge yet. I need to revert some of the changes.
In the shelf tool, I tried to delete all the changed chunks.
I was asked if I wanted to revert the file, I agreed, and got this error:
#!python
** Mercurial version (3.6+20151109). TortoiseHg version (3.6)
** Command: --nofork workbench
** CWD: D:\repos\auto-importer
** Encoding: cp1256
** Extensions loaded: rebase, convert, strip, mq
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\shelve.pyo", line 262, in deleteChunksA
File "tortoisehg\hgqt\chunks.pyo", line 283, in deleteSelectedChunks
File "mercurial\commands.pyo", line 5772, in revert
Abort: uncommitted merge with no revision specified