tests/test-hgrc.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 02 May 2006 18:44:02 +0200
changeset 2175 b2ae81a7df29
parent 1474 1e47f6fc0fdc
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1474
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
abort: Failed to parse .../t/.hg/hgrc
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
File contains no section headers.
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     3
file: .../t/.hg/hgrc, line: 1
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     4
'invalid\n'