tests/test-issue619
author Steve Borho <steve@ageia.com>
Tue, 02 Oct 2007 20:22:33 +0200
changeset 5350 1df76921aab3
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
set_exec: do not chmod a symlink

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