[MERGE] Use locations.conf instead of branches.conf

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> 
> This patch changes the default name for branches.conf to locations.conf,
> because
> 1. It is used to configure more things than just branches
> 2. It is more visually distinct from 'branch.conf' that way.
> 3. It hints at the fact that the location of the branch controls the
> associated info, and that moving the branch may change the associated info.
> 
> branches.conf is still supported, but produces a warning.
> 
> Aaron

I like it, mostly because locations.conf is different from
'bazaar.conf'. Though I'm not sure if that is what you meant to say.

I'll give you my support, but I think this kind of change needs a
general consensus, rather than just 2 people agreeing.

John
=:->

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

iD8DBQFEktkjJdeBCYSNAAMRAsBYAJ9MdbmSw2WmJGQfHjxm3rWaRJBdBgCfaiFR
z/f4fPKZYgwBHphW9a1GmnI=
=Wr+Q
-----END PGP SIGNATURE-----