tests/test-issue619
author Matt Mackall <mpm@selenic.com>
Thu, 02 Aug 2007 12:29:10 -0500
changeset 5059 8d9bdcbb2b18
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
merge: avoid double deletion mentioned in issue636

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