Rev 4761: (vila) Open 2.0.7 for bug fixes (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.0/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4761 [merge]
revision-id: pqm at pqm.ubuntu.com-20100917161445-cu2jsjltnzpryzvq
parent: pqm at pqm.ubuntu.com-20100917075457-0r38v56lwuvf129s
parent: v.ladeuil+lp at free.fr-20100917133235-yenqsp9fyurize3f
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Fri 2010-09-17 17:14:45 +0100
message:
  (vila) Open 2.0.7 for bug fixes (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2010-09-17 05:52:09 +0000
+++ b/NEWS	2010-09-17 13:32:35 +0000
@@ -5,6 +5,37 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 2.0.7
+#########
+
+:Codename: Nirvana
+:2.0.7: NOT RELEASED YET
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
 
 bzr 2.0.6
 #########
@@ -3741,7 +3772,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)
@@ -5541,7 +5572,7 @@
   checkouts.  (Aaron Bentley, #182040)
 
 * Stop polluting /tmp when running selftest.
-  (Vincent Ladeuil, #123623)
+  (Vincent Ladeuil, #123363)
 
 * Switch from NFKC => NFC for normalization checks. NFC allows a few
   more characters which should be considered valid.
@@ -7657,7 +7688,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
@@ -8941,11 +8972,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 'bzr'
--- a/bzr	2010-09-17 05:52:09 +0000
+++ b/bzr	2010-09-17 13:32:35 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 0, 6)
+_script_version = (2, 0, 7)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-09-17 05:52:09 +0000
+++ b/bzrlib/__init__.py	2010-09-17 13:32:35 +0000
@@ -50,7 +50,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, 0, 6, 'final', 0)
+version_info = (2, 0, 7, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)