tests/test-issue619
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 18 Jul 2007 13:56:08 -0700
changeset 4923 e8c0b52c363c
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Better fix for issue 622 than we had in c4dd58af0fc8.

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