tests/test-merge-force
author Martin Geisler <mg@daimi.au.dk>
Sat, 03 Jan 2009 17:15:21 +0100
changeset 7599 7bf7c073375e
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
lowercase ui.debug and assert output This does not effect the log or status commands and should be okay according to the compatibility rules.

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