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.

     1

diff -r acd8075edac9 b

     2

--- /dev/null

     3

+++ b/b

     4

@@ -0,0 +1,1 @@

     5

+123

     6

diff -r acd8075edac9 b

     7

--- /dev/null

     8

+++ b/b

     9

@@ -0,0 +1,1 @@

    10

+123

    11

diff -r acd8075edac9 a

    12

--- a/a

    13

+++ b/a

    14

@@ -0,0 +1,1 @@

    15

+foo

    16

diff -r acd8075edac9 b

    17

--- /dev/null

    18

+++ b/b

    19

@@ -0,0 +1,1 @@

    20

+123