tests/test-merge-default
author Brendan Cully <brendan@kublai.com>
Mon, 19 Mar 2007 09:36:06 -0700
changeset 4249 7663780b55a7
parent 2915 013921c753bd
child 5242 9cd6578750b9
permissions -rwxr-xr-x
Add hg-relink script to contrib

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