11
:2.2.6: NOT RELEASED YET
43
This is a bugfix release. One regression introduced in 2.2b1 has been fixed
44
for some rare conflict resolutions. Also a warning is now emmitted when
45
branching an out-of-date ubuntu packaging branch. Upgrading is recommended
46
for all users on earlier 2.2 releases.
61
* Correctly handle ``bzr log`` and `get_known_graph_ancestry` on a
62
doubly-stacked branch.
63
(James Westby, Martin Pool, #715000)
65
* Don't crash while merging and encountering obscure path conflicts
66
involving different root-ids. (Vincent Ladeuil, #805809)
71
* Fixed bug in the bundled copy of ConfigObj with quoting of triple quotes
72
in the value string. Fix suggested by ConfigObj's author Michael Foord.
73
(Alexander Belchenko, #710410)
81
This is a bugfix release. Only one bug has been fixed, a regression from 2.2.3
82
involving only certain operations with launchpad. Upgrading is recommended for
83
all users on earlier 2.2 releases.
88
* Fix communications with the Launchpad web service when using
89
launchpadlib >= 1.5.5. This was a latent bug in bzr's communication
90
with Launchpad's production instance, which only became a problem when
91
the default instance was switched from edge to production in bzr 2.2.3.
92
(Max Bowsher, #707075)
100
This is a bugfix release. Upgrading is recommended for all users
101
on earlier 2.2 releases.
106
* Launchpad has announced that the ``edge.launchpad.net`` instance is
107
deprecated and may be shut down in the future
108
<http://blog.launchpad.net/general/edge-is-deprecated>. Bazaar has therefore
109
been updated in this release to talk to the main (``launchpad.net``) servers,
110
rather than the ``edge`` ones. (Vincent Ladeuil, #583667)
115
* Avoid UnicodeDecodeError in ``bzr add`` with multiple files under a non-ascii
116
path on windows from symlink support addition. (Martin [gz], #686611)
118
* Correctly resolve content (and path) conflicts for files in subdirs.
119
(Vincent Ladeuil, #660935)
121
* Don't probe for a repository from within ``NotBranchError.__repr__``,
122
because this can cause knock-on errors at awkward times.
123
(Andrew Bennetts, #687653)
125
* Fix a crash during ``RepositoryPackCollection.pack`` caused by a
126
concurrent repository pack operation. This was particularly affecting
127
``bzr-svn`` users. (Andrew Bennetts, #701940)
129
* ``https`` access works again with recent versions of python2.7.
130
(Vincent Ladeuil, #693880)
132
* RevisionTree.is_executable no longer returns None for directories and
133
symlinks. Instead, it returns False, like other Trees and methods.
134
(Aaron Bentley, #681885)
11
:2.2.2: NOT RELEASED YET
142
This is a bugfix release. None of these bugfixes are critical, but upgrading
143
is recommended for all users on earlier 2.2 releases.
148
* ``bzr resolve --take-other <file>`` will not crash anymore if ``<file>``
149
is involved in a text conflict (but the conflict is still not
150
resolved). (Vincent Ladeuil, #646961)
152
* Commit in a bound branch or heavyweight checkout now propagates tags
153
(e.g. from a merge) to the master branch (and informs the user if there
154
is a conflict). (Andrew Bennetts, #603395)
156
* Correctly set the Content-Type header when HTTP POSTing to comply
157
with stricter web frameworks. (Vincent Ladeuil, #665100)
159
* ``NotBranchError`` no longer allows errors from calling
160
``bzrdir.open_repository()`` to propagate. This is unhelpful at best,
161
and at worst can trigger infinite loops in callers. (Andrew Bennetts)
22
163
* Skip tests that needs a bzr source tree when there isn't one. This is
23
164
needed to succesfully run the test suite for installed versions.
24
165
(Vincent Ladeuil, #644855).
26
* Skip the tests that requires respecting the chmod bits when running as root.
167
* Skip the tests that requires respecting the chmod bits when running as
168
root. Including the one that wasn't present in 2.1.
27
169
(Vincent Ladeuil, #646133)
171
* Using bzr with `lp:` URLs behind an HTTP proxy should work.
172
(Robert Collins, #558343)
174
* Windows installers no longer requires the Microsoft vcredist to be
176
(Martin [gz], Gary van der Merwe, #632465)
178
* Close leaked socket to SSH subprocesses, which caused dput sftp uploads
179
to hang. (Max Bowsher, #659590)
184
* Add ``tests/ssl_certs/ca.crt`` to the required test files list. Test
185
involving the pycurl https test server fail otherwise when running
186
selftest from an installed version. (Vincent Ladeuil, #651706)
44
188
* Fix tests that failed when run under ``LANG=C``.
45
189
(Andrew Bennetts, #632387)
added
removed
doc/en/release-notes/bzr-2.2.txt
