~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-02-02 14:44:01 UTC
mfrom: (6437.27.6 config_dir_decoding)
mto: (6437.54.1 2.5) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6462.
Revision ID: pqm@pqm.ubuntu.com-20120202144401-4mpclwk81vmy8coe

(gz) Make config.config_dir and related functions consistenly return unicode
(Martin Packman)

added added

removed removed

.. Changes that may require updates in plugins or other code that uses

bzrlib.

* ``config.config_dir`` and related functions now always return paths as

unicode. (Martin Packman, #825826)

* ``ControlDir`` now has a new method ``set_branch_reference`` which can

be used for setting branch references. (Jelmer Vernooij)