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

# Corrupt an hg repo with two pulls.

     4

#

     5

     6

# create one repo with a long history

     7

hg init source1

     8

cd source1

     9

touch foo

    10

hg add foo

    11

for i in 1 2 3 4 5 6 7 8 9 10; do

    12

    echo $i >> foo

    13

    hg ci -m $i

    14

done

    15

cd ..

    16

    17

# create a third repo to pull both other repos into it

    18

hg init version2

    19

hg -R version2 pull source1 &

    20

sleep 1

    21

    22

hg clone --pull -U version2 corrupted

    23

hg -R corrupted verify

    24

hg -R version2 verify