tests/test-merge-force
author Brodie Rao <me+hg@dackz.net>
Mon, 10 Aug 2009 22:59:29 +0200
changeset 9330 be2a13153372
parent 6256 69c75d063c7a
permissions -rwxr-xr-x
diffstat: scale adds/removes proportionally to graph width The previous method of scaling had a tendency to include graph lines that went past the output width when the file with the most changes had a very large number of changes.

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