view tests/test-simple-update @ 2019:ced2d3620f95

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.

#!/bin/sh

set -e

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest