tests/test-merge-default
author Benoit Allard <benoit@aeteurope.nl>
Mon, 08 Dec 2008 20:42:53 +0100
changeset 7492 8649b2a3de75
parent 5242 9cd6578750b9
child 8387 50b6af595e0c
permissions -rwxr-xr-x
tests: test-walkrepo shouldn't throw SystemExit Write to stdout instead of throwing Exceptions

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