~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-04-30 11:12:00 UTC
mfrom: (6437.57.7 2.5_text_progress_view_unicode_966934)
mto: (6437.63.1 2.5) (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 6525.
Revision ID: pqm@pqm.ubuntu.com-20120430111200-3zw0af8s9hhx877t

(gz) Encode progress task messages when written to a terminal (Martin
Packman)

added added

removed removed

destination rather than the proxy when checking certificates.

(Martin Packman, #944696)

* Fix UnicodeEncodeError when translated progress task messages contain

non-ascii text. (Martin Packman, #966934)

* Fixed merge tool availability checking and invocation to search the

Windows App Path registry in addition to the PATH. (Gordon Tyler, #939605)