view tests/test-merge-force @ 9651:bd3af545c7c6

diffstat: made test case work with POSIX sh and printf

* arithmetic expression ((...)), without $, is bashism.
* printf '\xXX' seems non-standard. '\0' is okay.
  http://www.opengroup.org/onlinepubs/009695399/utilities/printf.html

tested with bash 4.0 and dash 0.5.5.1

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