mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
d90427e78b
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.
10 lines
344 B
Plaintext
10 lines
344 B
Plaintext
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
|