Add username/merge/editor to .hgrc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add username/merge/editor to .hgrc
These take priority over the equivalent environment vars
Deprecate HGMERGE, HGUSER, and HGEDITOR in docs
Add ui section to docs
Remove undocumented HG_OPTS
Raise username code out of changelog class
Make tests ignore ~/.hgrc
manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr
qwGFd+WaNqTepZ0wun5g9Uc=
=QEBu
-----END PGP SIGNATURE-----
#!/bin/sh -ex
umask 027
mkdir test1
cd test1
hg init
touch a b
hg add a b
hg ci -t "added a b" -u test -d "0 0"
cd ..
mkdir test2
cd test2
hg init
hg pull ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"
cd ../test1
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"
hg pull ../test2
hg heads
hg history
hg -v co -m
ls -l ../test[12]/a > foo
cut -b 0-10 < foo