tests/test-issue619
author Robert Bachmann <rbach@rbach.priv.at>
Thu, 30 Aug 2007 16:42:17 +0200
changeset 5266 46c5e1ee8aaa
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Added support for the Atom syndication format

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