tests/test-issue619
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 15 Feb 2008 23:38:18 -0200
changeset 6127 25c372e8f261
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Simplify the output of test-bheads Also remove unneeded -d and -u commit options.

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