Rev 6438: (vila) Open trunk as 2.6dev1 (Vincent Ladeuil) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

Patch Queue Manager pqm at pqm.ubuntu.com
Mon Jan 16 14:27:38 UTC 2012


At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6438 [merge]
revision-id: pqm at pqm.ubuntu.com-20120116142737-incpbjom3tqo3hdb
parent: pqm at pqm.ubuntu.com-20120109122041-5efxdgkusn0a319w
parent: v.ladeuil+lp at free.fr-20120116134934-6lrrzc6d92n80t02
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-01-16 14:27:37 +0000
message:
  (vila) Open trunk as 2.6dev1 (Vincent Ladeuil)
added:
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
  doc/en/whats-new/whats-new-in-2.6.txt whatsnewin2.6.txt-20120116134316-8w1xxom1c7vcu1t5-2
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
=== modified file 'bzr'
--- a/bzr	2012-01-05 10:44:12 +0000
+++ b/bzr	2012-01-16 13:49:34 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (C) 2005-2011 Canonical Ltd
+# Copyright (C) 2005-2012 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 5, 0)
+_script_version = (2, 6, 0)
 
 NEED_VERS = (2, 6)
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/__init__.py	2012-01-16 13:49:34 +0000
@@ -46,7 +46,7 @@
 IGNORE_FILENAME = ".bzrignore"
 
 
-__copyright__ = "Copyright 2005-2011 Canonical Ltd."
+__copyright__ = "Copyright 2005-2012 Canonical Ltd."
 
 # same format as sys.version_info: "A tuple containing the five components of
 # the version number: major, minor, micro, releaselevel, and serial. All
@@ -55,7 +55,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, 5, 0, 'dev', 5)
+version_info = (2, 6, 0, 'dev', 1)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)

=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt	2011-11-15 17:14:30 +0000
+++ b/doc/developers/releasing.txt	2012-01-16 13:49:34 +0000
@@ -450,7 +450,7 @@
 the *last* beta for a given ``x.y`` series (from trunk aka lp:bzr), you need
 to setup *two* branches for the next cycle:
 
-#. ``lp:bzr`` needs to be opened for the next *series* ``x.(y+1)``
+#. ``lp:bzr`` needs to be opened for the next *series* ``x.(y+1)``.
 
 #. ``lp:bzr/x.y`` needs to be opened for the next *release* ``x.y.0`` in the
    series. Since this is first real use of ``lp:bzr/x.y``, this is also the
@@ -466,11 +466,15 @@
 
 In a nutshell:
 
-#. Create or update the ``x.y`` PQM branch based on whatever
-   revision you want to release
-
 #. Open ``lp:bzr`` for ``x.(y+1)``
 
+#. Create or update the ``x.y`` PQM branch based on whatever revision you
+   want to release. Since it takes time to create the PQM branch for the new
+   series you should plan to get it created a few days before you need it
+   and seed it with the revision from trunk you want to base your release of
+   (ask a LOSA for pulling this revision from trunk and pushing it to the
+   series branch (``lp:bzr/x.y``) when you're ready).
+
 #. Release ``x.y.0`` from ``lp:bzr/x.y``
 
 #. Open ``lp:bzr/x.y`` for bug fixes

=== added file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	1970-01-01 00:00:00 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-01-16 13:49:34 +0000
@@ -0,0 +1,61 @@
+####################
+Bazaar Release Notes
+####################
+
+.. toctree::
+   :maxdepth: 1
+
+bzr 2.6b1
+#########
+
+:2.6b1: NOT RELEASED YET
+
+External Compatibility Breaks
+*****************************
+
+.. These may require users to change the way they use Bazaar.
+
+New Features
+************
+
+.. New commands, options, etc that users may wish to try out.
+
+Improvements
+************
+
+.. Improvements to existing commands, especially improved performance 
+   or memory usage, or better results.
+
+Bug Fixes
+*********
+
+.. Fixes for situations where bzr would previously crash or give incorrect
+   or undesirable results.
+
+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.
+
+
+..
+   vim: tw=74 ft=rst ff=unix

=== added file 'doc/en/whats-new/whats-new-in-2.6.txt'
--- a/doc/en/whats-new/whats-new-in-2.6.txt	1970-01-01 00:00:00 +0000
+++ b/doc/en/whats-new/whats-new-in-2.6.txt	2012-01-16 13:49:34 +0000
@@ -0,0 +1,36 @@
+*************************
+What's New in Bazaar 2.6?
+*************************
+
+Bazaar 2.6 is still under development, and will be released in Auguest 2012.
+This document accumulates a high level summary of what's changed.  See the
+:doc:`../release-notes/index` for a full list.
+
+Users are encouraged to upgrade from the other stable series.  This document
+outlines the improvements in Bazaar 2.6 vs Bazaar 2.5. As well as
+summarizing improvements made to the core product, it highlights
+enhancements within the broader Bazaar world of potential interest to those
+upgrading.
+
+Bazaar 2.5.0 is fully compatible both locally and on the network with 2.0,
+2.1, 2.2, 2.3, 2.4 and 2.5, and can read and write repositories generated by
+all previous versions.
+
+<topics of interest here>
+
+Further information
+*******************
+
+For more detailed information on the changes made, see the the
+:doc:`../release-notes/index` for:
+
+* the interim bzr `milestones <https://launchpad.net/bzr/2.6>`_
+* the plugins you use.
+
+For a summary of changes made in earlier releases, see:
+
+* :doc:`whats-new-in-2.1`
+* :doc:`whats-new-in-2.2`
+* :doc:`whats-new-in-2.3`
+* :doc:`whats-new-in-2.4`
+* :doc:`whats-new-in-2.5`




More information about the bazaar-commits mailing list