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.
#!/bin/sh
hg init 1
echo '[ui]' >> 1/.hg/hgrc
echo 'timeout = 10' >> 1/.hg/hgrc
echo foo > 1/foo
hg --cwd 1 ci -A -m foo
hg clone 1 2
hg clone 2 3
echo '[hooks]' >> 2/.hg/hgrc
echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc
echo bar >> 3/foo
hg --cwd 3 ci -m bar
hg --cwd 3 push ../2