tests/test-issue619
author Patrick Mezard <pmezard@gmail.com>
Tue, 17 Jul 2007 23:33:42 +0200
changeset 5083 73169e5d2732
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
posixfile_nt: '+' was understood as read mode instead of update.

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