##// END OF EJS Templates
fix warnings from pychecker (unused variables and shadowing)
fix warnings from pychecker (unused variables and shadowing)

File last commit:

r1716:ef8cd889 default
r1749:d457fec7 default
Show More
test-excessive-merge
45 lines | 491 B | text/plain | TextLexer
/ tests / test-excessive-merge
Matt Mackall
Refactor excessive merge detection, add test
r1716 #!/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