tests/test-merge-default
author Martin Geisler <mg@lazybytes.net>
Sun, 14 Feb 2010 17:09:52 +0100
branchstable
changeset 10471 132eb7128ad5
parent 10355 a5576908b589
child 10504 d2c1fc440533
permissions -rwxr-xr-x
progress: use inline literals in help string

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

hg up 3
echo a >> a
hg branch foobranch
hg commit -mf
echo % should fail because merge with other branch
hg merge

true