tests/test-issue619
author Matt Mackall <mpm@selenic.com>
Tue, 02 Dec 2008 13:06:18 -0600
changeset 7463 6aafd75fb924
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Added signature for changeset 2a67430f92f1

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