tests/test-issue619
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 01 Aug 2007 10:42:42 +0200
changeset 5040 4f34d9b2568e
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Update style of record's cmdtable to match mercurial/commands.py

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