Rev 6064: Merge 2.4.2 and target 2.4.3 in file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Oct 27 15:04:36 UTC 2011
At file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/
------------------------------------------------------------
revno: 6064 [merge]
revision-id: v.ladeuil+lp at free.fr-20111027150435-12spmboagxaiqq3n
parent: v.ladeuil+lp at free.fr-20111027122648-x4b85k69pyrbpbkk
parent: pqm at pqm.ubuntu.com-20111027144157-4hksvwpd93mfylia
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 880701-resolve-duplicate
timestamp: Thu 2011-10-27 17:04:35 +0200
message:
Merge 2.4.2 and target 2.4.3
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
doc/en/whats-new/whats-new-in-2.4.txt whatsnewin2.4.txt-20110114044330-nipk1og7j729fy89-1
-------------- next part --------------
=== modified file 'bzr'
--- a/bzr 2011-09-09 13:30:12 +0000
+++ b/bzr 2011-10-27 14:16:10 +0000
@@ -23,7 +23,7 @@
import warnings
# update this on each release
-_script_version = (2, 4, 2)
+_script_version = (2, 4, 3)
try:
version_info = sys.version_info
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2011-09-09 13:30:12 +0000
+++ b/bzrlib/__init__.py 2011-10-27 14:16:10 +0000
@@ -52,7 +52,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (2, 4, 2, 'dev', 0)
+version_info = (2, 4, 3, 'dev', 0)
# API compatibility version
api_minimum_version = (2, 4, 0)
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt 2011-10-27 12:26:48 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt 2011-10-27 15:04:35 +0000
@@ -5,7 +5,7 @@
.. toctree::
:maxdepth: 1
-bzr 2.4.2
+bzr 2.4.3
#########
:2.4.2: NOT RELEASED YET
@@ -26,18 +26,75 @@
.. Improvements to existing commands, especially improved performance
or memory usage, or better results.
-* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
- every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
-
Bug Fixes
*********
+.. Fixes for situations where bzr would previously crash or give incorrect
+ or undesirable results.
+
* During merges, when two entries end up using the same path for two
different file-ids (the same file being 'bzr added' in two different
branches) , 'duplicate' conflicts are created instead of 'content'
ones. This was previously leading to a 'Malformed tramsform' exception.
(Vincent Ladeuil, #880701)
+* 'Malformed transform' exceptions are now recognized as internal errors
+ instead of user errors and report a traceback. This will reduce user
+ confusion as there is generally nothing users can do about them.
+ (Vincent Ladeuil, #880701)
+
+Documentation
+*************
+
+.. Improved or updated documentation.
+
+API Changes
+***********
+
+.. Changes that may require updates in plugins or other code that uses
+ bzrlib.
+
+Internals
+*********
+
+.. Major internal changes, unlikely to be visible to users or plugin
+ developers, but interesting for bzr developers.
+
+Testing
+*******
+
+.. Fixes and changes that are only relevant to bzr's test framework and
+ suite. This can include new facilities for writing tests, fixes to
+ spurious test failures and changes to the way things should be tested.
+
+
+bzr 2.4.2
+#########
+
+:2.4.2: 2011-10-27
+
+This is a bugfix release. Most of the bugs dealt with portability
+issues. Upgrading is recommended for all users of earlier 2.4 releases.
+
+External Compatibility Breaks
+*****************************
+
+None.
+
+New Features
+************
+
+None.
+
+Improvements
+************
+
+* Fixed a bug where ``bzr tags -r x..y`` loaded the branch history once for
+ every revision in the range; it's now much faster. (Vincent Ladeuil, #857335)
+
+Bug Fixes
+*********
+
* Fixed an infinite loop when creating a repo at the root of the filesystem,
i.e. "/", due to posixpath.normpath() not collapsing 2 leading slashes into
one, thus respecting the POSIX standard, but making relpath() loop infinitely.
@@ -49,11 +106,6 @@
* Include declaration of 'changed' to avoid an UnboundLocalError in dirstate
pyrex code with new Cython versions. (Denys Duchier, #837221)
-* 'Malformed transform' exceptions are now recognized as internal errors
- instead of user errors and report a traceback. This will reduce user
- confusion as there is generally nothing users can do about them.
- (Vincent Ladeuil, #880701)
-
* Prevent several kinds of OverflowError and other fallout from failing to fit
stat fields into four bytes in dirstate pack_stat implementations.
(Martin Packman, #683191 #706957)
@@ -66,27 +118,22 @@
Documentation
*************
-.. Improved or updated documentation.
+* Corrected documentation for ``bzr serve`` in the Admin Guide.
+ (Morten B��geskov, Martin Pool, #832576)
API Changes
***********
-.. Changes that may require updates in plugins or other code that uses
- bzrlib.
+None.
Internals
*********
-.. Major internal changes, unlikely to be visible to users or plugin
- developers, but interesting for bzr developers.
+No changes.
Testing
*******
-.. Fixes and changes that are only relevant to bzr's test framework and
- suite. This can include new facilities for writing tests, fixes to
- spurious test failures and changes to the way things should be tested.
-
* Accept both old and new style testtools output in selftest tests.
(Jelmer Vernooij, Martin Packman, #815423)
@@ -154,9 +201,6 @@
* Corrected documentation for BZR_PROGRESS_BAR.
(Dennis Benzinger, #735417)
-* Corrected documentation for ``bzr serve`` in the Admin Guide.
- (Morten B��geskov, Martin Pool, #832576)
-
API Changes
***********
=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt'
--- a/doc/en/whats-new/whats-new-in-2.4.txt 2011-09-08 16:16:27 +0000
+++ b/doc/en/whats-new/whats-new-in-2.4.txt 2011-10-27 13:20:43 +0000
@@ -24,6 +24,10 @@
and 2.3.5 versions that weren't included in 2.4.0 and fixes some bugs on its
own.
+Bazaar 2.4.2 includes all the fixes in the un-released 2.0.7, 2.1.5, 2.2.6
+and 2.3.5 versions that weren't included in 2.4.1 and fixes some bugs on its
+own.
+
Dropping Python2.4 and Python2.5 support
****************************************
More information about the bazaar-commits
mailing list