tests/test-merge-force
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 10 Sep 2008 17:55:49 +0200
changeset 7020 5e9965407d53
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
make test-mq-qdelete work reliably (issue1180) if after a and b has been applied, their hash starts with c, then the test would fail (because there would be a rev c which would be seen as "applied") so probability of failure would be 2*1/16.

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