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

syntax: glob

     2

     3

*.elc

     4

*.orig

     5

*.rej

     6

*~

     7

*.so

     8

*.pyc

     9

*.swp

    10

*.prof

    11

tests/.coverage*

    12

tests/annotated

    13

tests/*.err

    14

build

    15

dist

    16

doc/*.[0-9]

    17

doc/*.[0-9].gendoc.txt

    18

doc/*.[0-9].{x,ht}ml

    19

MANIFEST

    20

patches

    21

mercurial/__version__.py

    22

    23

syntax: regexp

    24

^\.pc/