tests/test-merge-default
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Tue, 29 May 2007 05:08:01 -0400
changeset 4458 e19d9b1223ee
parent 2915 013921c753bd
child 5242 9cd6578750b9
permissions -rwxr-xr-x
hgweb: manifest: pass parity for the '[up]' link

#!/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
hg commit -mm2

echo % should fail because 1 head
hg merge

true