Rev 4779: Prepare bzr.dev for ongoing 2.1.0b3-development in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Sat Oct 31 03:35:15 GMT 2009 

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

------------------------------------------------------------
revno: 4779 [merge]
revision-id: pqm at pqm.ubuntu.com-20091031033513-uxf0qaggw1uaere8
parent: pqm at pqm.ubuntu.com-20091030000037-8t6z4344pii34mb6
parent: john at arbash-meinel.com-20091030161305-fqsf00cgat8f22ny
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-10-31 03:35:13 +0000
message:
  Prepare bzr.dev for ongoing 2.1.0b3-development
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  doc/developers/_templates/layout.html layout.html-20090907074245-4b4pm5q3bjw2pt27-1
  doc/en/_templates/layout.html  layout.html-20090722133849-lus2rzwsmlhpgqhv-2
  doc/es/_templates/layout.html  layout.html-20090907060608-h0yq9dbax4xt09v5-1
  doc/ru/_templates/layout.html  layout.html-20090908150437-pppigv0c2cky3qbk-1
=== modified file 'NEWS'
--- a/NEWS	2009-10-30 00:00:37 +0000
+++ b/NEWS	2009-10-30 16:13:05 +0000
@@ -6,18 +6,83 @@
    :depth: 1
 
 
-bzr 2.1.0b2 (not released yet)
+bzr 2.1.0b3 (not released yet)
 ##############################
 
 :Codename:
-:2.1.0b2: ???
-
-
-Compatibility Breaks
-********************
-
-New Features
-************
+:2.1.0b3: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+
+bzr 2.0.3 (not released yet)
+############################
+
+:Codename: template
+:2.0.3: ???
+
+Compatibility Breaks
+********************
+
+New Features
+************
+
+Bug Fixes
+*********
+
+Improvements
+************
+
+Documentation
+*************
+
+API Changes
+***********
+
+Internals
+*********
+
+Testing
+*******
+
+
+bzr 2.1.0b2
+###########
+
+:Codename: a load off my mind
+:2.1.0b2: 2009-11-02
+
+This is our second feature-filled release since 2.0, pushing us down the
+path to a 2.1.0. Once again, all bugfixes in 2.0.2 are present in 2.1.0b2.
+
+Key highlights in this release are: improved handling of
+failures-during-cleanup for commit, fixing a long-standing bug with
+``bzr+http`` and shared repositories, and a new StaticTuple datatype,
+allowing us to reduce memory consumption (50%) and garbage collector
+overhead (40% faster) for many operations.
 
 Bug Fixes
 *********
@@ -25,20 +90,11 @@
 * ``bzr+http`` servers no longer give spurious jail break errors when
   serving branches inside a shared repository.  (Andrew Bennetts, #348308)
 
-* Diff parsing handles "Binary files differ" hunks.  (Aaron Bentley, #436325)
-
 * Errors during commit are handled more robustly so that knock-on errors
   are less likely to occur, and will not obscure the original error if
   they do occur.  This fixes some causes of ``TooManyConcurrentRequests``
   and similar errors.  (Andrew Bennetts, #429747, #243391)
 
-* Fetching from stacked pre-2a repository via a smart server no longer
-  fails intermittently with "second push failed to complete".
-  (Andrew Bennetts, #437626)
-
-* PreviewTree file names are not limited by the encoding of the temp
-  directory's filesystem. (Aaron Bentley, #436794)
-
 * TreeTransform.adjust_path updates the limbo paths of descendants of adjusted
   files.  (Aaron Bentley)
 
@@ -106,21 +162,15 @@
   peak memory for initial copies (~200MB). (John Arbash Meinel)
 
 
-Testing
-*******
-
-
-bzr 2.0.2 (not released yet)
-############################
-
-:Codename:
-:2.0.2: ???
-
-Compatibility Breaks
-********************
-
-New Features
-************
+bzr 2.0.2
+#########
+
+:Codename: after the scare
+:2.0.2: 2009-11-02
+
+The second in our "let's keep the stable bugfixes flowing" series. As
+expected this has a few (~9) bugfixes relative to 2.0.1, and no major api
+changes or features.
 
 Bug Fixes
 *********
@@ -158,15 +208,6 @@
 * Filtered views user documentation upgraded to refer to format 2a
   instead of pre-2.0 formats. (Ian Clatworthy)
 
-API Changes
-***********
-
-Internals
-*********
-
-Testing
-*******
-
 
 bzr 2.1.0b1
 ###########

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-10-15 04:06:32 +0000
+++ b/bzrlib/__init__.py	2009-10-30 16:13:05 +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, 0, 'dev', 2)
+version_info = (2, 1, 0, 'dev', 3)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (2, 1, 0)

=== modified file 'doc/developers/_templates/layout.html'
--- a/doc/developers/_templates/layout.html	2009-09-07 07:44:36 +0000
+++ b/doc/developers/_templates/layout.html	2009-10-30 07:51:16 +0000
@@ -6,3 +6,22 @@
 <a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
 {{ super() }}
 {% endblock %}
+
+{% block document %}
+ <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ?  "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try{
+  var pageTracker = _gat._getTracker("UA-1018242-1");
+  pageTracker._trackPageview();
+  } catch(err) {}
+  try {
+    /* bazaar team tracker */
+    var pageTracker = _gat._getTracker("UA-11329411-2");
+    pageTracker._trackPageview();
+  } catch(err) {}
+</script>
+{{ super() }}
+{% endblock %}

=== modified file 'doc/en/_templates/layout.html'
--- a/doc/en/_templates/layout.html	2009-09-03 00:21:59 +0000
+++ b/doc/en/_templates/layout.html	2009-10-30 07:51:16 +0000
@@ -6,3 +6,22 @@
 <a href="http://doc.bazaar-vcs.org/en/">Documentation</a>&nbsp;|&nbsp;</li>
 {{ super() }}
 {% endblock %}
+
+{% block document %}
+ <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ?  "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try{
+  var pageTracker = _gat._getTracker("UA-1018242-1");
+  pageTracker._trackPageview();
+  } catch(err) {}
+  try {
+    /* bazaar team tracker */
+    var pageTracker = _gat._getTracker("UA-11329411-2");
+    pageTracker._trackPageview();
+  } catch(err) {}
+</script>
+{{ super() }}
+{% endblock %}

=== modified file 'doc/es/_templates/layout.html'
--- a/doc/es/_templates/layout.html	2009-09-07 06:12:15 +0000
+++ b/doc/es/_templates/layout.html	2009-10-30 07:51:16 +0000
@@ -6,3 +6,22 @@
 <a href="http://doc.bazaar-vcs.org/en/">Documentación</a>&nbsp;|&nbsp;</li>
 {{ super() }}
 {% endblock %}
+
+{% block document %}
+ <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ?  "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try{
+  var pageTracker = _gat._getTracker("UA-1018242-1");
+  pageTracker._trackPageview();
+  } catch(err) {}
+  try {
+    /* bazaar team tracker */
+    var pageTracker = _gat._getTracker("UA-11329411-2");
+    pageTracker._trackPageview();
+  } catch(err) {}
+</script>
+{{ super() }}
+{% endblock %}

=== modified file 'doc/ru/_templates/layout.html'
--- a/doc/ru/_templates/layout.html	2009-09-08 15:06:56 +0000
+++ b/doc/ru/_templates/layout.html	2009-10-30 07:51:16 +0000
@@ -6,3 +6,22 @@
 <a href="http://doc.bazaar-vcs.org/ru/">Документация</a>&nbsp;|&nbsp;</li>
 {{ super() }}
 {% endblock %}
+
+{% block document %}
+ <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ?  "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try{
+  var pageTracker = _gat._getTracker("UA-1018242-1");
+  pageTracker._trackPageview();
+  } catch(err) {}
+  try {
+    /* bazaar team tracker */
+    var pageTracker = _gat._getTracker("UA-11329411-2");
+    pageTracker._trackPageview();
+  } catch(err) {}
+</script>
+{{ super() }}
+{% endblock %}

More information about the bazaar-commits mailing list