tests/test-merge-force
author Brendan Cully <brendan@kublai.com>
Sun, 23 Nov 2008 00:44:31 -0800
changeset 7398 2cd1308cb588
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
mq: gracefully abort qpush/qgoto to guarded patch (issue1186)

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