tests/test-issue619
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 05 Aug 2007 22:36:39 -0300
changeset 5079 ccdc8db02bdf
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
hgweb: don't use os.path.join to build URL parts

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