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

port:4:export

     2

port:4:vaportight

     3

port:4:import/export

     4

FIXME: history is wrong here

     5

port:1:1:-:eggs:import

     6

port:1:2:+:eggs:vaportight

     7

port:1:3:+:eggs:import/export

     8

port:0:2:+:spam:export

     9

port:0:1:+:spam:import

    10

port:4:import/export