tests/test-merge-force
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Wed, 11 Nov 2009 17:48:00 +0100
changeset 9876 6e8a16dd3e30
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
alias: improve help text for command aliases Displays the line "alias for: hg ..." with the original command including options, followed by the command's original help text.

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