tests/test-merge-force
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Mon, 04 May 2009 17:11:49 +0900
changeset 8322 3c6c21eb3416
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
inotify: inotify.server.walkrepodirs() simplify walking Do not 'yield tuple, boolean' to filter later on the boolean. Test the boolean first, and yield tuple only if needed.

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