##// END OF EJS Templates
merge with crew-stable
merge with crew-stable

File last commit:

r3853:c0b44915 default
r4181:ac9e891f merge default
Show More
test-excessive-merge
46 lines | 566 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/store/00changelog.i
echo
echo 1
hg manifest --debug 1
echo 2
hg manifest --debug 2
echo 3
hg manifest --debug 3
echo 4
hg manifest --debug 4
echo
hg debugindex .hg/store/data/a.i
hg verify