hg pull: ditch .hgpaths for new .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg pull: ditch .hgpaths for new .hgrc The format is like this: [paths] main = http://selenic.com/hg hgweb = http://edge2.net/hg/hgweb/ hgdoc = http://edge2.net/hg/man/ manifest hash: fc99889443381bdecc223f09ee65a74a8d5952c1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCp3VKywK+sNU5EO8RAsbfAKCrzNh2yKI0KF9qCzHPz7eXjx688wCeKmIL RXfAOuycKOTVJU6oFnBbBBo= =OjMb -----END PGP SIGNATURE-----

     1

set -ex

     2

export EDITOR=true

     3

rm -rf test branch

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit

    11

hg verify

    12

cd ..

    13

    14

cp -a test branch

    15

cd branch

    16

echo bar>>foo

    17

hg commit

    18

    19

cd ../test

    20

hg merge ../branch

    21

hg verify

    22