##// END OF EJS Templates
Make hg update more verbose by default (issue12)...
Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.

File last commit:

r2175:b2ae81a7 default
r2175:b2ae81a7 default
Show More
test-pull.out
23 lines | 687 B | text/plain | TextLexer
Bryan O'Sullivan
Update tests to match new addremove chattiness.
r767 adding foo
mpm@selenic.com
Add some more tests...
r336 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
requesting all changes
adding changesets
adding manifests
mpm@selenic.com
Fix up test results...
r775 adding file changes
added 1 changesets with 1 changes to 1 files
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
Add some more tests...
r336 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
r2175 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
Add some more tests...
r336 foo
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
mpm@selenic.com
Fix empty pull bug that appeared this morning...
r522 pulling from http://localhost:20059/
searching for changes
no changes found