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 0 > a

     7

echo 0 > b

     8

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

     9

hg rm a

    10

hg cat a

    11

sleep 1 # make sure mtime is changed

    12

echo 1 > b

    13

hg ci -m m -d "1000000 0"

    14

echo 2 > b

    15

hg cat -r 0 a

    16

hg cat -r 0 b

    17

hg cat -r 1 a

    18

hg cat -r 1 b