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

--

     2

A dir/b.o

     3

? a.c

     4

? a.o

     5

? dir/c.o

     6

? syntax

     7

--

     8

abort: .hgignore: invalid pattern (relre): *.o

     9

--

    10

A dir/b.o

    11

? .hgignore

    12

? a.c

    13

? syntax

    14

--

    15

.hgignore: ignoring invalid syntax 'invalid'

    16

A dir/b.o

    17

? .hgignore

    18

? a.c

    19

? a.o

    20

? dir/c.o

    21

? syntax

    22

--

    23

A dir/b.o

    24

? .hgignore

    25

? a.c

    26

? syntax

    27

--

    28

A dir/b.o

    29

? .hgignore

    30

? a.c

    31

? a.o

    32

? dir/c.o

    33

--

    34

A dir/b.o

    35

--

    36

A b.o