tests/test-issue619
author Martin Geisler <mg@lazybytes.net>
Sun, 17 May 2009 01:24:45 +0200
changeset 8447 d5ebcf8f6855
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
tests: fix doc string in get-with-headers.py

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