~bzr-pqm/bzr/bzr.dev

(vila) Add the opt-in ability to expand options in config files (Vincent
Ladeuil)

added added

removed removed

* External merge tools can now be configured in bazaar.conf. See

``bzr help configuration`` for more information. (Gordon Tyler, #489915)

* Configuration options can now use references to other options in the same

file by enclosing them with curly brackets (``{other_opt}``). This makes it

possible to use, for example,

``push_location=lp:~vila/bzr/config-{nickname}`` in ``branch.conf`` when

using a loom. During the beta period, the default behaviour is to disable

this feature. It can be activated by declaring ``bzr.config.expand = True``

in ``bazaar.conf``. (Vincent Ladeuil)

Improvements

************