Actually warn on pulling from an unrelated repository -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Actually warn on pulling from an unrelated repository add some comments to findincoming track the base nodes of the fetch set report if the base set only contains nullid add a test case manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j ClLpn0dKZnB46dh0F8zhuuk= =emNb -----END PGP SIGNATURE-----

     1

#!/bin/sh

     2

     3

export HGMERGE=true

     4

     5

set -ex

     6

mkdir r1

     7

cd r1

     8

hg init

     9

echo a > a

    10

hg addremove

    11

hg commit -t "1" -u test -d "0 0"

    12

    13

hg clone . ../r2

    14

cd ../r2

    15

hg up

    16

echo abc > a

    17

hg diff > ../d

    18

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    19

    20

cd ../r1

    21

echo b > b

    22

echo a2 > a

    23

hg addremove

    24

hg commit -t "2" -u test -d "0 0"

    25

    26

cd ../r2

    27

hg -q pull ../r1

    28

hg status

    29

hg -d up

    30

hg -d up -m

    31

hg parents

    32

hg -v history

    33

hg diff > ../d

    34

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    35