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 test

     4

cd test

     5

echo foo>foo

     6

hg init

     7

hg addremove

     8

hg commit -m 1

     9

hg verify

    10

hg serve -p 20059 -d --pid-file=hg.pid

    11

cd ..

    12

    13

http_proxy= hg clone http://localhost:20059/ copy

    14

cd copy

    15

hg verify

    16

hg co

    17

cat foo

    18

hg manifest

    19

hg pull

    20

    21

kill `cat ../test/hg.pid`