tests/test-excessive-merge
author Robin Farine <robin.farine@terminus.org>
Sat, 18 Feb 2006 07:37:59 -0800
changeset 1747 91c56c427171
parent 1716 ef8cd889a78b
child 1933 7544700fd931
permissions -rwxr-xr-x
transitive copy/rename Add support for transitive copy or rename operations, e.g. hg rename a b ... (possibly edit b) hg rename b c hg commit ... by actually renaming "b" as "c" while recording a copy of "a" to "c" and a removal of "a".

#!/bin/sh

hg init

echo foo > a
echo foo > b
hg add a b

hg ci -m "test" -d "0 0"

echo blah > a

hg ci -m "branch a" -d "0 0"

hg co 0

echo blah > b

hg ci -m "branch b" -d "0 0"
HGMERGE=true hg up -m 1

hg ci -m "merge b/a -> blah" -d "0 0"

hg co 1
HGMERGE=true hg up -m 2
hg ci -m "merge a/b -> blah" -d "0 0"

hg log
hg debugindex .hg/00changelog.i

echo

echo 1
hg manifest 1
echo 2
hg manifest 2
echo 3
hg manifest 3
echo 4
hg manifest 4

echo

hg debugindex .hg/data/a.i

hg verify