tests/test-issue619
author Christian Ebert <blacktrash@gmx.net>
Wed, 22 Jul 2009 19:12:34 +0100
changeset 9190 3ef6c14a1e8e
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
keyword: argument to "kwdemo --rcfile" must be string (bugfix)

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