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

mkdir t

     4

cd t

     5

hg init

     6

echo 0 > a

     7

echo 0 > b

     8

hg ci -A -m m -d "1000000 0"

     9

hg rm a

    10

hg cat a

    11

sleep 1 # make sure mtime is changed

    12

echo 1 > b

    13

hg ci -m m -d "1000000 0"

    14

echo 2 > b

    15

hg cat -r 0 a

    16

hg cat -r 0 b

    17

hg cat -r 1 a

    18

hg cat -r 1 b