TortoiseHG crash when trying to merge or rebase commits imported from SVN
On one of my repositories, trying to merge or rebase gives the following error:
#!python
** Mercurial version (6.1). TortoiseHg version (6.1)
** Command:
** CWD: C:\WINDOWS\system32
** Encoding: cp1252
** Extensions loaded: rebase, tortoisehg.util.configitems
** Python version: 2.7.18 (v2.7.18:8d21aa21f2, Apr 20 2020, 13:25:05) [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.9 PyQt-5.13.2 QScintilla-2.10.8
Traceback (most recent call last):
File "tortoisehg\hgqt\repowidget.pyo", line 2037, in mergeWithRevision
File "tortoisehg\hgqt\qtlib.pyo", line 1284, in open
File "tortoisehg\hgqt\qtlib.pyo", line 1304, in _preparedlg
File "tortoisehg\hgqt\qtlib.pyo", line 1307, in _populatedlg
File "tortoisehg\hgqt\repowidget.pyo", line 240, in <lambda>
File "tortoisehg\hgqt\repowidget.pyo", line 2040, in _createMergeDialog
File "tortoisehg\hgqt\merge.pyo", line 69, in __init__
File "tortoisehg\hgqt\merge.pyo", line 199, in __init__
File "tortoisehg\hgqt\csinfo.pyo", line 109, in __call__
File "tortoisehg\hgqt\csinfo.pyo", line 485, in update
File "tortoisehg\hgqt\csinfo.pyo", line 392, in get_markup
File "tortoisehg\hgqt\csinfo.pyo", line 350, in get_markup
File "tortoisehg\hgqt\csinfo.pyo", line 316, in preset_func
TypeError: decoding Unicode is not supported
Following the traceback it's to do with displaying SVN commit details - which does appear to be the case; this repository contains commits imported from an SVN repo, and I can't rebase or merge against those commits, but can successfully rebase two local commits made in THG that haven't come from SVN.
I can merge and rebase as expected using hg on the command line, which makes sense (it's solely the display of these details within THG that's causing the crash?).