add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.

     1

#!/bin/sh

     2

     3

hg init

     4

touch unknown

     5

     6

touch a

     7

hg add a

     8

hg ci -m "1" -d "1000000 0"

     9

    10

touch b

    11

hg add b

    12

hg ci -m "2" -d "1000000 0"

    13

    14

echo %% Should show unknown

    15

hg status

    16

hg revert -r 0

    17

echo %% Should show unknown and b removed

    18

hg status

    19

echo %% Should show a and unknown

    20

ls