[issue1606] unknown exception encountered - blue screen of death

[jsussex]

New submission from jsussex <john at lane15.co.uk>:

During  the merge a file I had a blue screen of death on Vista, the merge was
kicked off form the command line and was using winmerge. Since this I cannot
commit. I have removed and reinstalled tortoise hg , to no effect.

here is the error: 


** unknown exception encountered, details follow
** report bug details to http://www.selenic.com/mercurial/bts
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.2.1)
** Extensions loaded: extdiff
Traceback (most recent call last):
 File "hg", line 38, in <module>
 File "mercurial\dispatch.pyc", line 16, in run
 File "mercurial\dispatch.pyc", line 25, in dispatch
 File "mercurial\dispatch.pyc", line 41, in _runcatch
 File "mercurial\dispatch.pyc", line 372, in _dispatch
 File "mercurial\dispatch.pyc", line 247, in runcommand
 File "mercurial\dispatch.pyc", line 417, in _runcommand
 File "mercurial\dispatch.pyc", line 377, in checkargs
 File "mercurial\dispatch.pyc", line 371, in <lambda>
 File "mercurial\util.pyc", line 718, in check
 File "mercurial\commands.pyc", line 629, in commit
 File "mercurial\cmdutil.pyc", line 1185, in commit
 File "mercurial\commands.pyc", line 627, in commitfunc
 File "mercurial\localrepo.pyc", line 820, in commit
 File "mercurial\merge.pyc", line 16, in __init__
 File "mercurial\merge.pyc", line 33, in _read
TypeError: Non-hexadecimal digit found

----------
messages: 9062
nosy: jsussex
priority: urgent
status: unread
title: unknown exception encountered - blue screen of death

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1606>
____________________________________________________