tests/test-issue619
author Raoul Bhatia [IPAX] <r.bhatia@ipax.at>
Fri, 09 Oct 2009 16:27:05 +0200
changeset 9581 3b93032516b3
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
use short identifiers in atom feed

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