Mercurial > hg

diff tests/test-resolve @ 11451:51021f4c80b5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: do not crash on empty mergestate I managed to get an empty .hg/merge/state file by interrupting a merge by pressing Control-C. This lead to this error: TypeError: a2b_hex() argument 1 must be string or read-only buffer, not None since localnode is assigned None before the iteration over lines in the mergestate begins.
author Martin Geisler <mg@lazybytes.net>
date Sun, 27 Jun 2010 23:12:05 +0200
parents 6c82beaaa11a
children
line wrap: on
line diff
--- a/tests/test-resolve	Wed Jun 23 16:54:12 2010 -1000
+++ b/tests/test-resolve	Sun Jun 27 23:12:05 2010 +0200
@@ -25,3 +25,9 @@
 
 echo % resolve -l, should be empty
 hg resolve -l
+
+# test crashed merge with empty mergestate
+mkdir .hg/merge
+touch .hg/merge/state
+echo % resolve -l, should be empty
+hg resolve -l