Trying to shelve in a uncommited merge yelds a traceback
Created originally on Bitbucket by Flávio Etrusco (Flávio Viveiros de Castro Etrusco)
After the error the the shelve file is created but the working copy isn't updated. This is the traceback:
{{{ #!python ** Mercurial version (1.8.3). TortoiseHg version (2.0.4) ** Command: --nofork workbench ** CWD: C:\Users\etrusco\projetos_logann\bhtrans_totem\20 - Fontes\BhtransTotem ** Extensions loaded: fixfrozenexts, hgsubversion, mq ** Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)] ** Windows version: (6, 1, 7601, 2, 'Service Pack 1') ** Processor architecture: x86 ** Qt-4.7.1 PyQt-4.8.3 Traceback (most recent call last): File "tortoisehg\hgqt\shelve.pyo", line 206, in moveFileRight File "tortoisehg\hgqt\chunks.pyo", line 321, in removeFile File "mercurial\commands.pyo", line 3287, in revert Abort: uncommitted merge - use "hg update", see "hg help revert"
}}}