tests/test-issue619
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 11 Oct 2007 16:19:12 +0200
changeset 5454 f2ca8d2c988f
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
explicitely use integer division

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