tests/test-issue619
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 31 Aug 2007 13:14:03 +0200
changeset 5274 694eb9ccb54d
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
convert/subversion: Use util.set() instead of set() for python2.3 compatibility

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