tests/test-issue619
author Henrik Stuart <henrik.stuart at edlund.dk>
Wed, 08 Apr 2009 19:32:16 +0200
changeset 8025 1280934dd2dd
parent 4748 8808ea7da86b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
patchbomb: Support initial in-reply-to header This allows follow-up/revised patches to appear properly threaded in mail readers and in the archives, reducing noise.

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