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

mkdir t

     4

cd t

     5

hg init

     6

echo a > a

     7

hg add a

     8

hg commit -m "test" -d "1000000 0"

     9

hg verify

    10

hg parents

    11

hg status

    12

hg undo

    13

hg verify

    14

hg parents

    15

hg status