Python Traceback on Merge
Created originally on Bitbucket by joymaker3 (Ken Brooks)
I was doing what I thought to be a very ordinary merge between two branches.
#!python
** Mercurial version (4.8). TortoiseHg version (4.8)
** Command:
** CWD: C:\WINDOWS\system32
** Encoding: cp1252
** Extensions loaded: mercurial_keyring, tortoisehg.util.configitems, rebase
** Python version: 2.7.13 (v2.7.13:a06454b1afa1, Dec 17 2016, 20:53:40) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=2, build=9200, platform=2, service_pack='')
** Processor architecture: x64
** Qt-5.9.2 PyQt-5.9.1 QScintilla-2.10.2.dev1711012104
Traceback (most recent call last):
File "tortoisehg\hgqt\merge.pyo", line 113, in pageChanged
File "tortoisehg\hgqt\merge.pyo", line 368, in currentPage
TypeError: %d format: a number is required, not NoneType