##// END OF EJS Templates
Moving hgweb.py into it's own module in preparation for breaking it up.
Moving hgweb.py into it's own module in preparation for breaking it up.

File last commit:

r2283:e506c143 default
r2311:b832b6eb default
Show More
test-excessive-merge
46 lines | 522 B | text/plain | TextLexer
/ tests / test-excessive-merge
#!/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