##// END OF EJS Templates
Ignore .DS_Store directories...
Ignore .DS_Store directories These are used by Finder on OS X.

File last commit:

r2283:e506c143 default
r2987:12d1475b default
Show More
test-excessive-merge
46 lines | 522 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
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg ci -m "test" -d "1000000 0"
Matt Mackall
Refactor excessive merge detection, add test
r1716
echo blah > a
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg ci -m "branch a" -d "1000000 0"
Matt Mackall
Refactor excessive merge detection, add test
r1716
hg co 0
echo blah > b
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg ci -m "branch b" -d "1000000 0"
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 HGMERGE=true hg merge 1
Matt Mackall
Refactor excessive merge detection, add test
r1716
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg ci -m "merge b/a -> blah" -d "1000000 0"
Matt Mackall
Refactor excessive merge detection, add test
r1716
hg co 1
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 HGMERGE=true hg merge 2
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 hg ci -m "merge a/b -> blah" -d "1000000 0"
Matt Mackall
Refactor excessive merge detection, add test
r1716
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
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
r2283 hg verify