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

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

clone: print "updating working directory" status message...
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Benoit Boissinot - - Load All Authors

File last commit:

r3853:c0b44915 default
r6338:0750f111 default
Show More
test-excessive-merge
46 lines | 566 B | text/plain | TextLexer
/ tests / test-excessive-merge
History | Source | Raw |Copy content |Copy permalink
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
Benoit Boissinot
switch to the .hg/store layout, fix the tests
 r3853 hg debugindex .hg/store/00changelog.i
Matt Mackall
Refactor excessive merge detection, add test
 r1716
echo
echo 1
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug 1
Matt Mackall
Refactor excessive merge detection, add test
 r1716 echo 2
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug 2
Matt Mackall
Refactor excessive merge detection, add test
 r1716 echo 3
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug 3
Matt Mackall
Refactor excessive merge detection, add test
 r1716 echo 4
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug 4
Matt Mackall
Refactor excessive merge detection, add test
 r1716
echo
Benoit Boissinot
switch to the .hg/store layout, fix the tests
 r3853 hg debugindex .hg/store/data/a.i
Matt Mackall
Refactor excessive merge detection, add test
 r1716
Vadim Gelfer
deprecate 'update -m'. use 'merge' instead.
 r2283 hg verify