tests/test-resolve
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 09 Feb 2010 14:02:07 +0100
changeset 10404 3e7cbe859871
parent 8167 6c82beaaa11a
child 11451 51021f4c80b5
permissions -rwxr-xr-x
revlog.size: remove alternate implementation (revlogv0 specific) it's only useful for revlogv0 anyway, revlogNG has the uncompressed size in the index.

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