Rev 3468: (mbp) merge 1.6b1 back to trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3468
revision-id:pqm at pqm.ubuntu.com-20080603072242-omtkkk586pc5k4d4
parent: pqm at pqm.ubuntu.com-20080603024259-ml79gk3n5uywnxe0
parent: mbp at sourcefrog.net-20080603065634-2yczyrm9jgmzh2hr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-06-03 08:22:42 +0100
message:
  (mbp) merge 1.6b1 back to trunk
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3464.1.2
    revision-id:mbp at sourcefrog.net-20080603065634-2yczyrm9jgmzh2hr
    parent: mbp at sourcefrog.net-20080603065559-6memzjge3lyy27o3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Tue 2008-06-03 16:56:34 +1000
    message:
      Correction to news summary
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3464.1.1
    revision-id:mbp at sourcefrog.net-20080603065559-6memzjge3lyy27o3
    parent: pqm at pqm.ubuntu.com-20080601233619-di6or8d3o26n917q
    parent: mbp at sourcefrog.net-20080602075120-tr2t0bl5a9mz2owg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: integration
    timestamp: Tue 2008-06-03 16:55:59 +1000
    message:
      Merge back 1.6beta1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3464.2.1
    revision-id:mbp at sourcefrog.net-20080602075120-tr2t0bl5a9mz2owg
    parent: pqm at pqm.ubuntu.com-20080601233619-di6or8d3o26n917q
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.6beta1
    timestamp: Mon 2008-06-02 17:51:20 +1000
    message:
      Preparing 1.6beta1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2008-06-03 02:13:34 +0000
+++ b/NEWS	2008-06-03 07:22:42 +0000
@@ -4,25 +4,21 @@
 
 .. contents::
 
-IN DEVELOPMENT
---------------
-
-This release adds a translation of some of the user documentation into Spanish.
-(Contributions of other translations would be very welcome.)
+
+bzr 1.6beta1 2008-06-02
+-----------------------
+
+
+Commands that work on the revision history such as push, pull, missing,
+uncommit and log are now substantially faster.  This release adds a
+translation of some of the user documentation into Spanish.  (Contributions of
+other translations would be very welcome.)  Bazaar 1.6beta1 adds a new network
+protocol which is used by default and which allows for more efficient transfers
+and future extensions.
+
 
   NOTES WHEN UPGRADING:
 
-  CHANGES:
-
-    * Deprecation warnings will not be suppressed when running ``bzr selftest``
-      so that developers can see if their code is using deprecated functions.
-      (John Arbash Meinel)
-
-  FEATURES:
-
-    * Adding ``-Derror`` will now display a traceback when a plugin fails to
-      load. (James Westby)
-
     * There is a new version of the network protocol used for bzr://, bzr+ssh://
       and bzr+http:// connections.  This will allow more efficient requests and
       responses, and more graceful fallback when a server is too old to
@@ -32,6 +28,17 @@
       these protocols.  Use alternatives like SFTP or upgrade those servers.
       (Andrew Bennetts, #83935)
 
+  CHANGES:
+
+    * Deprecation warnings will not be suppressed when running ``bzr selftest``
+      so that developers can see if their code is using deprecated functions.
+      (John Arbash Meinel)
+
+  FEATURES:
+
+    * Adding ``-Derror`` will now display a traceback when a plugin fails to
+      load. (James Westby)
+
   IMPROVEMENTS:
 
     * ``bzr branch/push/pull -r XXX`` now have a helper function for finding

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-05-16 21:00:25 +0000
+++ b/bzrlib/__init__.py	2008-06-03 06:55:59 +0000
@@ -41,7 +41,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 = (1, 6, 0, 'dev', 0)
+version_info = (1, 6, 0, 'beta', 2)
 
 
 # API compatibility version: bzrlib is currently API compatible with 0.18.