tests/test-merge-force
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 04 May 2009 19:51:08 +0200
changeset 8292 29540554def8
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
verify: reference the correct linkrev when a filelog is missing when a filelog is missing, the first bad revision is the first revision where the filelog is referenced, not 0.

#!/bin/sh

hg init repo
cd repo

echo a > a
hg ci -qAm 'add a'

echo b > b
hg ci -qAm 'add b'

hg up -qC 0
hg rm a
hg ci -m 'rm a'

hg up -qC 1
rm a

echo '% local deleted a file, remote removed'
hg merge # should fail, since there are deleted files
hg -v merge --force
echo % should show a as removed
hg st

hg ci -m merge
echo % manifest. should not have a:
hg manifest