##// 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-static-http.out
24 lines | 613 B | text/plain | TextLexer
/ tests / test-static-http.out
Thomas Arendsen Hein
Removed obsolete workaround for error message in tests/test-static-http.
r1935 abort: Connection refused
Bryan O'Sullivan
Fix old-http test when no server exists.
r1323 255
TK Soh
tests: more portability fix for the old systems
r1962 copy: No such file or directory
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 changeset: 0:53e17d176ae6
mpm@selenic.com
Add an old-http test case...
r1111 tag: tip
user: test
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
r1933 date: Mon Jan 12 13:46:40 1970 +0000
mpm@selenic.com
Add an old-http test case...
r1111 summary: test
requesting all changes
adding changesets
adding manifests
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 an old-http test case...
r1111 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
foo
pulling from old-http://localhost:20059/remote
searching for changes
no changes found