Merge fails if filename contains $$
Created originally on Bitbucket by hgbug123 (H. G. Bug)
In Mercurial 3.6.3, the Mercurial developers fixed bug 4970, related to merging branches where conflicting files contain $$ in the filename.
This fix (which was a fix in Mercurial itself, and has nothing to do with TortoiseHg) was effective. It is now possible to perform the problem merge using Mercurial directly (i.e., on the command line).
However, it seems that now TortoiseHg is choking on this same scenario with:
#!python
** Mercurial version (3.6.3). TortoiseHg version (3.6.3)
** Command: --nofork workbench
** CWD: C:\Users\hgbug123\Downloads\4970
** Encoding: cp1252
** Extensions loaded: strip, mq, eol
** Python version: 2.7.9 (default, Dec 10 2014, 12:28:03) [MSC v.1500 64 bit (AMD64)]
** Windows version: sys.getwindowsversion(major=6, minor=1, build=7601, platform=2, service_pack='Service Pack 1')
** Processor architecture: x64
** Qt-4.8.6 PyQt-4.11.3 QScintilla-2.8.4
Traceback (most recent call last):
File "tortoisehg\hgqt\cmdcore.pyo", line 415, in _dispatchRead
File "tortoisehg\hgqt\cmdcore.pyo", line 473, in _processLineRequest
File "tortoisehg\hgqt\cmdui.pyo", line 276, in getLineInput
File "tortoisehg\hgqt\cmdui.pyo", line 291, in _getChoiceInput
ValueError: substring not found
The exact reproduction repository and steps outlined in Mercurial bug 4970 will reproduce this failure in TortoiseHg.