tests/test-issue619
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 08 Aug 2007 12:27:20 +0200
changeset 5122 c80af96943aa
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
refactor options from cmdtable - add extracommitopts for user and date - factor stuff

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