tests/test-excessive-merge
author John Arbash Meinel <john@arbash-meinel.com>
Thu, 18 May 2006 13:52:55 -0700
changeset 2310 d01eac5968c6
parent 2283 e506c14382fd
child 3736 ad3d5b4367cb
permissions -rwxr-xr-x
demandload: implement __call__ demandload can now load functions and classes, and not just modules. (So if you access foo() rather than just foo.* it still works). demandload still doesn't work for constants.

#!/bin/sh

hg init

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

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

echo blah > a

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

hg co 0

echo blah > b

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

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

hg co 1
HGMERGE=true hg merge 2
hg ci -m "merge a/b -> blah" -d "1000000 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