tests/test-merge-default
author Matt Mackall <mpm@selenic.com>
Mon, 25 Jun 2007 11:30:05 -0500
changeset 4703 bc63247c66e9
parent 2915 013921c753bd
child 5242 9cd6578750b9
permissions -rwxr-xr-x
hgweb: improve shortlog formatting shorten author with |person don't shrink font (default font is presumed to be preferred reading size) set widths based on font ems rather than page percents.

#!/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 1 head
hg merge

true