view tests/test-issue619 @ 6280:9db24a36d182

patch: check filename is /dev/null for creation or deletion (issue 1033)

Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0

echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'

echo bogus fast-forward should fail
hg merge b

echo done