tests/test-issue619
author Brendan Cully <brendan@kublai.com>
Mon, 09 Jul 2007 22:12:28 -0700
changeset 4850 f3802f9f1840
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Add SSL support to hg serve, activated via --certificate option

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