mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +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.
34 lines
548 B
Bash
Executable File
34 lines
548 B
Bash
Executable File
#!/bin/sh
|
|
|
|
# test that a commit clears the merge state.
|
|
|
|
hg init repo
|
|
cd repo
|
|
|
|
echo foo > file
|
|
hg commit -Am 'add file'
|
|
|
|
echo bar >> file
|
|
hg commit -Am 'append bar'
|
|
|
|
echo % create a second head
|
|
hg up -C 0
|
|
echo baz >> file
|
|
hg commit -Am 'append baz'
|
|
|
|
echo % failing merge
|
|
HGMERGE=internal:fail hg merge
|
|
|
|
echo resolved > file
|
|
hg resolve -m file
|
|
hg commit -m 'resolved'
|
|
|
|
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
|