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 test

     4

cd test

     5

echo foo>foo

     6

hg init

     7

hg addremove

     8

hg commit -m 1

     9

hg verify

    10

hg serve -p 20059 -d --pid-file=hg.pid

    11

cd ..

    12

    13

http_proxy= hg clone http://localhost:20059/ copy

    14

cd copy

    15

hg verify

    16

hg co

    17

cat foo

    18

hg manifest

    19

hg pull

    20

    21

kill `cat ../test/hg.pid`