tests/test-issue619
author Pascal Quantin <pascal.quantin@gmail.com>
Sun, 29 Aug 2010 23:16:31 +0200
branchstable
changeset 12081 787a5a71e524
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
win32: add hgweb scripts to Inno Setup installer

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