tests/test-merge-default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 13 Feb 2007 10:00:17 -0200
changeset 4078 ff08cebcd116
parent 2903 013921c753bd
child 5224 9cd6578750b9
permissions -rwxr-xr-x
hg serve: call setconfig on the parentui It makes sense to do this on the "global" ui object, since command line options should affect the whole process. This should fix hg serve --style=gitweb inside a repo (part of issue253).

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