tests/test-issue619
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sun, 07 Feb 2010 14:51:52 +0100
changeset 10369 98a0421b9e52
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
commands: annotate follows by default, separate -f/--file option

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