tests/test-issue619
author Martin Geisler <mg@aragost.com>
Wed, 11 Aug 2010 12:19:01 +0200
branchstable
changeset 11776 13921a1af02b
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
graphlog: mark --branch as incompatible with --graph The --only-branch option was deprecated in 0d5f139b23c1 and --branch was added instead. But the graphlog extension was not updated to match the change.

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