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
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
ls
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg co 0
# B should disappear
ls