[MERGE] Harmonize branch.conf with locations.conf and bazaar.conf

[Aaron Bentley]

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

Martin Pool wrote:
> OK, that sounds good.  But we should think about how to update the
> documentation (particularly doc/configuration.txt) to explain this.  (We
> can do it here on the list.)

There are some interactions between locations.conf and branch.conf that
I'm not quite comfortable with yet.  Right now, a recursive match in
locations.conf will override branch.conf, and that seems wrong to me
because branch.conf is the more specific match.

But if we were to change it, then the order would be
1. locations.conf exact match
2. branch.conf
3. locations.conf recursion match

And that looks like a recipe for confusion.  But we can't let
branch.conf override locations.conf, because locations.conf is local
data and branch.conf may not be.

And I'm not sure what to do about cascading.  push locations make
cascading important, but we can put push locations in branch.conf, which
would reduce the issue's importance.  OTOH, gpg-signing-command and
post-commit *must not* be controlled by branches.conf.  post-commit is
likely to be branch-specific, and therefore it must be put in
locations.conf.

So while I'm confident this patch is a step in the right direction, I'm
not certain whether it's a stage we'll stay at for a while, or whether
we'll decide to do more.

Still, I'll look into updating the documentation.

> The patch looks reasonable but I would like someone else to review it
> too.

Okay.

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

iD8DBQFEmLka0F+nu1YWqI0RAk7dAJ9NWcqnOI4nREkODH5Rz5OOpe8QdACfdDpx
U/gLi29di+l/PatZKDP4eJU=
=6ZMH
-----END PGP SIGNATURE-----