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

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify