tests/test-resolve
author Cédric Duval <cedricduval@free.fr>
Sat, 04 Jul 2009 12:06:33 +0200
changeset 9020 609b803dd252
parent 8167 6c82beaaa11a
child 11451 51021f4c80b5
permissions -rwxr-xr-x
extensions: remove dead code enabled used to be a boolean, and somehow that bit of code inadvertently slipped through during a refactoring. Effectively dead code, as the condition can never be triggered.

#!/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