tests/test-issue619
author Eric Hopper <hopper@omnifarious.org>
Wed, 08 Aug 2007 22:47:30 +0200
changeset 5123 f94dbc6c7eaf
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.

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