annotate tests/test-bad-pull.out @ 2175:b2ae81a7df29

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.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 02 May 2006 18:44:02 +0200
parents 30c7564f6dfc
children a765f853439d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 705
diff changeset
1 abort: error: Connection refused
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset
2 255
1962
2a676ad52c22 tests: more portability fix for the old systems
TK Soh <teekaysoh@yahoo.com>
parents: 925
diff changeset
3 copy: No such file or directory
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
4 abort: HTTP Error 404: File not found
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset
5 255