tests/test-rename-dir-merge2
author Michael Gebetsroither <michael.geb@gmx.at>
Thu, 08 Mar 2007 22:36:12 +0100
changeset 4164 5c1e18bb804c
parent 4115 c95060a5391a
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

mkdir r1
cd r1
hg init
mkdir a
echo foo > a/f
hg add a
hg ci -m "a/f == foo"
cd ..

hg clone r1 r2
cd r2
hg mv a b
echo foo1 > b/f
hg ci -m" a -> b, b/f == foo1"
cd ..

cd r1
mkdir a/aa
echo bar > a/aa/g
hg add a/aa
hg ci -m "a/aa/g"
hg pull ../r2

hg merge

hg st -C