tests/test-issue619
author Steve Borho <steve@borho.org>
Tue, 18 Sep 2007 19:53:01 -0500
changeset 5469 b12432b1c2c7
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Allow explicit disabling of extensions If the first character of an extension path is '!', the extension is silently skipped.

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