tests/test-merge-default
author Henri Wiechers <hwiechers@gmail.com>
Mon, 21 Dec 2009 23:01:46 +0200
changeset 10121 ac212bcc852b
parent 8834 6d36fc70754e
child 10355 a5576908b589
permissions -rwxr-xr-x
test-help: improve test coverage Adds a test for using the help option with the version option. Extends test coverage of commands.help_ by another 2 lines.

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

true