view tests/test-merge-default @ 10110:9ed13f718e53

test-help: improve test coverage Adds a test for displaying the short list of commands with the verbose option i.e. 'hg -v help shortlist'. Extends test coverage of commands.help_ by 2 lines.
author Henri Wiechers <hwiechers@gmail.com>
date Mon, 21 Dec 2009 12:18:43 +0200
parents 6d36fc70754e
children a5576908b589
line wrap: on
line source

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