Traceback error while attempting to merge
Created originally on Bitbucket by DaveInCaz (David Hollman)
I am getting this error when trying to do a merge. I don't know if there is anything special about this merge causing the problem, or if any merge would do this.
I started with a clean working folder having used hg shelve first.
Click Merge toolbar button
Click the revision to merge with
Click the [Merge] button
Click [Next] on Prepare to Merge screen
Instantly get the error
#!python #!python ** Mercurial version (4.8). TortoiseHg version (4.8) ** Command: ** CWD: C:\Program Files\TortoiseHg ** Encoding: cp1252 ** Extensions loaded: convert, graphlog, eol, strip, transplant, rebase, relink, extdiff, share, shelve, tortoisehg.util.configitems ** 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
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information