Rev 5037: (mbp) merge 2.1 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: 5037 [merge]
revision-id: pqm at pqm.ubuntu.com-20100217055715-5b8xt6dfbov0bbgz
parent: pqm at pqm.ubuntu.com-20100216005304-1p8xafkhiizh6ugi
parent: mbp at sourcefrog.net-20100217051201-1sd9dssoujfdc6c4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2010-02-17 05:57:15 +0000
message:
  (mbp) merge 2.1 back to trunk
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
  bzrlib/tests/per_tree/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
=== modified file 'NEWS'
--- a/NEWS	2010-02-12 15:15:24 +0000
+++ b/NEWS	2010-02-17 05:12:01 +0000
@@ -5,11 +5,11 @@
 .. contents:: List of Releases
    :depth: 1
 
-bzr 2.2.0b1 (not released yet)
-##############################
+bzr 2.2.0b1
+###########
 
 :Codename: ???
-:2.2.0b1: ???
+:2.2.0b1: Not released yet
 
 Compatibility Breaks
 ********************
@@ -92,11 +92,24 @@
 * Stop sending apport crash files to ``.cache`` in the directory from
   which ``bzr selftest`` was run.  (Martin Pool, #422350)
 
-bzr 2.1.0 (not released yet)
-############################
-
-:Codename: 
-:2.1.0: 
+bzr 2.1.0
+#########
+
+:Codename: Strasbourg
+:2.1.0: 2010-02-11
+
+This release marks our second long-term-stable series. The Bazaar team
+has decided that we will continue to make bugfix-only 2.0.x and 2.1.x
+releases, along with 2.2 development releases. 
+
+This is a fairly incremental update, focusing on polish and bugfixing.
+There are no changes for supported disk formats. Key updates include
+reduced memory consumption for many operations, a new per-file merge
+hook, ignore patterns can now include '!' to exclude files, globbing
+support for all commands on Windows, and support for addressing home
+directories via ``bzr+ssh://host/~/`` syntax.
+
+Users are encouraged to upgrade from the 2.0 stable series.
 
 Bug Fixes
 *********

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-02-10 00:31:24 +0000
+++ b/bzrlib/__init__.py	2010-02-17 05:12:01 +0000
@@ -35,7 +35,7 @@
 IGNORE_FILENAME = ".bzrignore"
 
 
-__copyright__ = "Copyright 2005, 2006, 2007, 2008, 2009 Canonical Ltd."
+__copyright__ = "Copyright 2005-2010 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
@@ -46,7 +46,7 @@
 
 version_info = (2, 2, 0, 'dev', 1)
 
-# API compatibility version: bzrlib is currently API compatible with 1.15.
+# API compatibility version
 api_minimum_version = (2, 1, 0)
 
 

=== modified file 'bzrlib/push.py'
--- a/bzrlib/push.py	2010-02-12 01:35:24 +0000
+++ b/bzrlib/push.py	2010-02-16 16:08:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Canonical Ltd
+# Copyright (C) 2008, 2009, 2010 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

=== modified file 'bzrlib/tests/per_tree/test_inv.py'
--- a/bzrlib/tests/per_tree/test_inv.py	2010-02-12 03:33:36 +0000
+++ b/bzrlib/tests/per_tree/test_inv.py	2010-02-16 16:08:40 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2010 Canonical Ltd
+# Copyright (C) 2007-2010 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