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
mkdir a
cd a
hg init
echo a > a
hg add a
hg commit -m test -d '0 0'
# Default operation
hg clone . ../b
cd ../b
cat a
hg verify
# No update
hg clone -U . ../c
cd ../c
cat a 2>/dev/null || echo "a not present"
hg verify
# Default destination
mkdir ../d
cd ../d
hg clone ../a
cd a
hg cat a