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

#!/bin/sh

     2

     3

hg init rep

     4

cd rep

     5

mkdir dir

     6

touch foo dir/bar

     7

hg -v addremove

     8

hg -v commit -m "add 1" -d "1000000 0"

     9

cd dir/

    10

touch ../foo_2 bar_2

    11

hg -v addremove

    12

hg -v commit -m "add 2" -d "1000000 0"