Can't back out a merge
Created originally on Bitbucket by ekolis (Ed Kolis)
If I try to back out a merge that has occurred at some point in the past (i.e. is not the current head), I can go through all the dialogs, but then nothing actually happens.
If I first update to the merge in question, and back out, then I get this lovely error:
#!
#!python
** Mercurial version (2.7.2). TortoiseHg version (2.9.2)
** Command: --nofork workbench
** CWD: C:\Users\Ed\Documents\Visual Studio 2012\Projects\FrEee
** Encoding: cp1252
** Extensions loaded: hgsubversion, hggit, rebase, mq, attic
** Python version: 2.7.3 (default, Apr 10 2012, 23:24:47) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-4.8.4 PyQt-4.10.2 QScintilla-2.7.2
Traceback (most recent call last):
File "tortoisehg\hgqt\thread.pyo", line 283, in run
File "tortoisehg\util\hglib.pyo", line 884, in dispatch
File "mercurial\dispatch.pyo", line 778, in _dispatch
File "mercurial\dispatch.pyo", line 549, in runcommand
File "mercurial\dispatch.pyo", line 869, in _runcommand
File "mercurial\dispatch.pyo", line 840, in checkargs
File "mercurial\dispatch.pyo", line 775, in <lambda>
File "mercurial\util.pyo", line 507, in check
File "mercurial\extensions.pyo", line 143, in wrap
File "mercurial\util.pyo", line 507, in check
File "hgext\mq.pyo", line 3533, in mqcommand
File "mercurial\util.pyo", line 507, in check
File "mercurial\commands.pyo", line 482, in backout
File "mercurial\cmdutil.pyo", line 1900, in commitstatus
TypeError: __int__ returned non-int (type NoneType)