tests/test-merge-default
author Michael Gebetsroither <michael.geb@gmx.at>
Thu, 08 Mar 2007 22:36:12 +0100
changeset 4164 5c1e18bb804c
parent 2915 013921c753bd
child 5242 9cd6578750b9
permissions -rwxr-xr-x
hgweb: use the given revision in the name of the archive If you ask for an archive in hgweb by tagname the directory in the archive should include the tagname not the changeset-id.

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