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

[John Arbash Meinel]

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

Robert Collins wrote:
> On Fri, 2006-06-16 at 12:33 -0400, Aaron Bentley wrote:
>> I agree about the need for consensus.  I've previously discussed this
>> with Martin and Robert, and they were fine with it.  But I can wait
>> and
>> see if they've had second thoughts. 
> 
> None here.
> 
> Rob

The only problem with the current warning, is that you don't know what
'branches.conf' it is talking about.
We really should write out:

bzr: WARNING: Please rename ~/.bazaar/branches.conf to
~/.bazaar/locations.conf

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFElKxXJdeBCYSNAAMRAnC+AJ0WKooCWHPb8blNqVKSMfnxBZCh9ACgosFY
ANaYB0dtgO5HlKGyR/Q5JkA=
=DPoM
-----END PGP SIGNATURE-----