[MERGE] Warn when setting push location is masked by locations.conf (#122286)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

A difference between Branch5 (knit) and Branch6 (dirstate-tags) is that
Branch6 stores all config data in branch.conf.  Branch5 had stored
push_location in locations.conf.

Unfortunately, this means that if a branch is upgraded from Branch5 to
Branch6, its old push_location will override any new location set with
push --remember.

This patch adds an optional warning when setting user options to a
masked value, and enables it for all branch values.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGi7YU0F+nu1YWqI0RAsgvAJ4oUS8bQ64e02IdoIIDEDxZOYhT1ACZAbQc
siJIj7DHa45r2JYkkZGCZ9o=
=X3+s
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: warn-masked-values.patch
Type: text/x-patch
Size: 9100 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070704/20dbd50b/attachment.bin