tests/test-issue619
author Patrick Mezard <pmezard@gmail.com>
Fri, 15 Jan 2010 09:50:52 +0100
branchstable
changeset 10249 8ebb34b0f6f7
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
cmdutil: expand style paths (issue1948) Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>

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