Rev 4858: (vila) Release 2.1.3 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4858 [merge]
revision-id: pqm at pqm.ubuntu.com-20100917170733-l67mqzqtmz0qaikk
parent: pqm at pqm.ubuntu.com-20100917110005-us7utppp0b50qyk7
parent: v.ladeuil+lp at free.fr-20100917141225-vox8ku2xbpxtz13h
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Fri 2010-09-17 18:07:33 +0100
message:
  (vila) Release 2.1.3 (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2010-09-17 10:02:28 +0000
+++ b/NEWS	2010-09-17 17:07:33 +0000
@@ -11,20 +11,30 @@
 :Codename: Do run run
 :2.1.3: NOT RELEASED YET
 
-Compatibility Breaks
-********************
-
-New Features
-************
+The third release in our 2.1 series addresses several user-inconvenience bugs
+(and includes the fixes done in 2.0.6).  None are critical, but upgrading is
+recommended for all users on earlier 2.1 releases.
 
 Bug Fixes
 *********
 
+* Additional merges after an unrelated branch has been merged with its
+  history no longer crash when deleted files are involved.
+  (Vincent Ladeuil, John Arbash Meinel, #375898)
+
 * ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
   previously-unversioned directory within the tree: the directory is
   marked versioned too.  
   (Martin Pool, #192859)
 
+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
+  target of the symlink.
+  (Martin Pool, John Arbash Meinel, #128562)
+
+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
+  permissions as ``.bzr`` directory on a POSIX OS.
+  (Parth Malwankar, #262450)
+
 * Configuration files in ``${BZR_HOME}`` are now written in an atomic
   way which should help avoid problems with concurrent writers.
   (Vincent Ladeuil, #525571)
@@ -48,25 +58,35 @@
 * Raise ValueError instead of a string exception.
   (John Arbash Meinel, #586926)
 
+* Reduce peak memory by one copy of compressed text.
+  (John Arbash Meinel, #566940)
+
+* Repositories accessed via a smart server now reject being stacked on a
+  repository in an incompatible format, as is the case when accessing them
+  via other methods.  This was causing fetches from those repositories via
+  a smart server (e.g. using ``bzr branch``) to receive invalid data.
+  (Andrew Bennetts, #562380)
+
+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
+  error. This error was caused by 2.0 not being updated when upstream
+  python merged the end of run patch, which chose ``stopTestRun`` rather than
+  ``done``. (Robert Collins, #571437)
+
 * Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
   being thrown from ``xml_serializer`` on certain cElementTree setups.
   (Martin [gz], #254278)
 
-Improvements
-************
-
-Documentation
-*************
-
-API Changes
-***********
-
-Internals
-*********
+* When passing a file to ``UTF8DirReader`` make sure to close the current
+  directory file handle after the chdir fails. Otherwise when passing many
+  filenames into a command line ``bzr status`` we would leak descriptors.
+  (John Arbash Meinel, #583486)
 
 Testing
 *******
 
+* ``build_tree_contents`` can create symlinks.
+  (Martin Pool, John Arbash Meinel)
+
 bzr 2.1.2
 #########
 
@@ -146,7 +166,7 @@
 * Fix plugin packaging on Windows. (Ian Clatworthy, #524162)
 
 * Fix stub sftp test server to call os.getcwdu().
-  (Vincent Ladeuil, #526211, #526353)
+  (Vincent Ladeuil, #526221, #526353)
 
 * Fixed CHM generation by moving the NEWS section template into
   a separate file. (Ian Clatworthy, #524184)
@@ -4884,7 +4904,7 @@
   when the path to the root of the tree has been given. Users of
   the internal ``show_tree_status`` function should be aware that
   the show_pending flag is now authoritative for showing pending
-  merges, as it was originally. (Robert Collins, #225204)
+  merges, as it was originally. (Robert Collins, #255204)
 
 * Set valid default _param_name for Option so that ListOption can embed
   '-' in names. (Vincent Ladeuil, #263249)
@@ -8800,7 +8820,7 @@
   hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes
   iterator was using direct comparison and ``'abc/a'`` sorts after
   ``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
-  (John Arbash Meinel, #111227)
+  (John Arbash Meinel, #111127)
 
 * Handle when someone renames a file on disk without telling bzr.
   Previously we would report the first file as missing, but not show
@@ -10084,11 +10104,11 @@
 * ``Branch.bind(other_branch)`` no longer takes a write lock on the
   other branch, and will not push or pull between the two branches.
   API users will need to perform a push or pull or update operation if they
-  require branch synchronisation to take place. (Robert Collins, #47344)
+  require branch synchronisation to take place. (Robert Collins, #43744)
 
 * When creating a tarball or zipfile export, export unicode names as utf-8
   paths. This may not work perfectly on all platforms, but has the best
-  chance of working in the common case. (John Arbash Meinel, #56816)
+  chance of working in the common case. (John Arbash Meinel, #56815)
 
 * When committing, only files that exist in working tree or basis tree
   may be specified (Aaron Bentley, #50793)

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-09-17 10:02:28 +0000
+++ b/bzrlib/__init__.py	2010-09-17 17:07:33 +0000
@@ -44,7 +44,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, 1, 3, 'dev', 0)
+version_info = (2, 1, 3, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (2, 1, 0)