Clicking "Cancel" in "local changed %s which remote deleted..."
Selecting "Cancel" in the prompt popup that results when I modify a file and then "update null" results in the following traceback:
Please report this bug to http://bitbucket.org/tortoisehg/thg/issues Mercurial version (unknown). TortoiseHg version (1.9.3+235-8a8a47d5b74e) Command: CWD: c:\export\spare\HgLocalRepoTemp Extensions loaded: transplant, rebase, fetch, mq, histedit, eol Python version: 2.6.6 (r266:84297, Aug 24 2010, 18:46:32) [MSC v.1500 32 bit (Intel)] Windows version: (6, 1, 7600, 2, '') Processor architecture: x64 ** Qt-4.7.1 PyQt-4.8.3 Traceback (most recent call last): File "C:\export\spare\thg\thg\tortoisehg\hgqt\thread.py", line 239, in interact_handler result = rmap[id(button)] KeyError: 190929992
(sorry for the bunch of edits)