view tests/test-merge-default @ 5331:8ee5b8129e7b

hgweb: don't raise an exception when displying empty repos

The nullid node claims it's in the default branch, but the branch dict
is empty.  This fixes the main symptom from issue696, but we may want
to set branchtags()['default'] = nullid somewhere for empty repos.

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