tests/test-merge-default
author Martin Geisler <mg@lazybytes.net>
Sun, 12 Jul 2009 21:37:24 +0200
changeset 9113 f439d82f018c
parent 8834 6d36fc70754e
child 10355 a5576908b589
permissions -rwxr-xr-x
gitweb, monoblue: fix double-spacing in file view (issue1733) The error was introduced in 338412820a57.

#!/bin/sh

hg init
echo a > a
hg commit -A -ma

echo a >> a
hg commit -mb

echo a >> a
hg commit -mc

hg up 1
echo a >> a
hg commit -md

hg up 1
echo a >> a
hg commit -me

hg up 1
echo % should fail because not at a head
hg merge

hg up
echo % should fail because \> 2 heads
hg merge

echo % should succeed
hg merge 2
hg commit -mm1

echo % should succeed - 2 heads
hg merge -P
hg merge
hg commit -mm2

echo % should fail because at tip
hg merge

hg up 0
echo % should fail because 1 head
hg merge

true