tests/test-issue619
author Christian Ebert <blacktrash@gmx.net>
Wed, 03 Oct 2007 21:01:47 +0200
changeset 5359 645a40777fd4
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
test-convert-cvs: handle older cvs client

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