tests/test-conflict
author Michael Gebetsroither <michael.geb@gmx.at>
Thu, 08 Mar 2007 22:36:12 +0100
changeset 4163 5c1e18bb804c
parent 2283 e506c14382fd
child 4361 46280c004f22
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 "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg merge 1
hg id
egrep -v ">>>|<<<" a
hg status