##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

resolve: do not crash on empty mergestate...
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.
Martin Geisler - - Load All Authors

File last commit:

r11451:51021f4c stable
r11451:51021f4c stable
Show More
test-resolve.out
9 lines | 344 B | text/plain | TextLexer
/ tests / test-resolve.out
History | Annotation | Raw |Copy content |Copy permalink
adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% resolve -l, should be empty
% resolve -l, should be empty