tests/test-rename-merge1
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 16 Oct 2006 09:53:31 +0200
changeset 3409 1ae738bacf74
parent 3295 764688cf51e5
child 3853 c0b449154a90
permissions -rwxr-xr-x
Fixed page overlap for file revision links in hgweb. This is another step to fix issue189, but currently the file revision numbers are read as changeset revision numbers, so the link will point to the wrong revision.

#!/bin/sh

mkdir t
cd t
hg init
echo "[merge]" >> .hg/hgrc
echo "followcopies = 1" >> .hg/hgrc
echo foo > a
echo foo > a2
hg add a a2
hg ci -m "start" -d "0 0"
hg mv a b
hg mv a2 b2
hg ci -m "rename" -d "0 0"
echo "checkout"
hg co 0
echo blahblah > a
echo blahblah > a2
hg mv a2 c2
hg ci -m "modify" -d "0 0"
echo "merge"
hg merge -y --debug
hg status -AC
cat b
hg ci -m "merge" -d "0 0"
hg debugindex .hg/data/b.i
hg debugrename b