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

hg init 1

     3

echo '[ui]' >> 1/.hg/hgrc

     4

echo 'timeout = 10' >> 1/.hg/hgrc

     5

echo foo > 1/foo

     6

hg --cwd 1 ci -A -m foo

     7

hg clone 1 2

     8

hg clone 2 3

     9

echo '[hooks]' >> 2/.hg/hgrc

    10

echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

    11

echo bar >> 3/foo

    12

hg --cwd 3 ci -m bar

    13

hg --cwd 3 push ../2