tests/test-issue619
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 17 Jul 2007 09:39:30 -0700
changeset 4897 4574925db5c0
parent 4815 8808ea7da86b
permissions -rwxr-xr-x
Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch

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