tests/test-merge-default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Fri, 15 Feb 2008 23:38:18 -0200
changeset 6127 25c372e8f261
parent 5242 9cd6578750b9
child 8387 50b6af595e0c
permissions -rwxr-xr-x
Simplify the output of test-bheads Also remove unneeded -d and -u commit options.

#!/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 at tip
hg merge

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

true