##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Use python instead of shell printf with \x sequences for test-encoding....
Use python instead of shell printf with \x sequences for test-encoding. Needed e.g. to be compatible with Solaris.
Matt Mackall - - Load All Authors

File last commit:

r3736:ad3d5b43 default
r3789:734b1d6b default
Show More
test-excessive-merge
46 lines | 554 B | text/plain | TextLexer
/ tests / test-excessive-merge
History | Annotation | Raw |Copy content |Copy permalink
#!/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 --debug 1
echo 2
hg manifest --debug 2
echo 3
hg manifest --debug 3
echo 4
hg manifest --debug 4
echo
hg debugindex .hg/data/a.i
hg verify