tests/test-issue619
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 22 Apr 2009 01:53:15 +0200
changeset 8107 0eeb4f0a5d21
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
run-tests: fix -jN broken by 60a9e3cf0cf4

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