tests/test-merge-force
author Eric Eisner <ede@mit.edu>
Mon, 26 Apr 2010 15:58:36 -0400
changeset 11047 c7dbd6c4877a
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
tags: return tags in sorted order This makes log and summary have less arbitrary tag ordering and also groups similar tags together, such as the mq tags.

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