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-----
#!/bin/sh -x
set +e
BASE=foo.base
BR1=foo.br1
BR2=foo.br2
BR2_1=foo.br2_1
mkdir $BASE
cd $BASE
hg init
echo test > file
hg add file
EDITOR="echo 'initial commit' > " hg commit
cd ..
mkdir $BR1
cd $BR1
hg branch ../$BASE
hg checkout
echo test > file1
hg addremove
EDITOR="echo side commit >" hg commit
cd ..
mkdir $BR2
cd $BR2
hg branch ../$BASE
hg checkout
echo yet more >> file2
hg addremove
EDITOR="echo second update >" hg commit
cd ..
mkdir $BR2_1
cd $BR2_1
hg branch ../$BR2
hg checkout
EDITOR="echo commit merge >" hg merge ../$BR1
hg checkout