tests/test-issue619
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 29 Jul 2007 19:32:55 +0200
changeset 5028 36e8983fe44d
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
test-convert: Hide warning about missing subversion bindings.

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