Rev 3223: Open 1.3 development in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3223
revision-id:pqm at pqm.ubuntu.com-20080213045747-hqu3aghke3zn12b7
parent: pqm at pqm.ubuntu.com-20080213031902-4xhmwps49vclfhh6
parent: mbp at sourcefrog.net-20080213032553-3b7vz132w0mje0gd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-13 04:57:47 +0000
message:
  Open 1.3 development
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
    ------------------------------------------------------------
    revno: 3221.2.1
    revision-id:mbp at sourcefrog.net-20080213032553-3b7vz132w0mje0gd
    parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: prepare-1.3
    timestamp: Wed 2008-02-13 14:25:53 +1100
    message:
      Open 1.3 development
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
=== modified file 'NEWS'
--- a/NEWS	2008-02-07 06:59:48 +0000
+++ b/NEWS	2008-02-13 03:25:53 +0000
@@ -9,6 +9,26 @@
 
   NOTES WHEN UPGRADING:
   
+  CHANGES:
+
+  FEATURES:
+
+  IMPROVEMENTS:
+
+  BUGFIXES:
+
+  API BREAKS:
+
+  TESTING:
+
+  INTERNALS:
+
+
+bzr 1.2rc1 (not released yet)
+-----------------------------
+
+  NOTES WHEN UPGRADING:
+  
     * Fetching via the smart protocol may need to reconnect once during a fetch
       if the remote server is running Bazaar 1.1 or earlier, because the client
       attempts to use more efficient requests that confuse older servers.  You

=== modified file 'bzr'
--- a/bzr	2008-01-15 11:13:19 +0000
+++ b/bzr	2008-02-13 03:25:53 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 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
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 2, 0)
+_script_version = (1, 3, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-01-22 05:04:50 +0000
+++ b/bzrlib/__init__.py	2008-02-13 03:25:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 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
@@ -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, 2, 0, 'dev', 0)
+version_info = (1, 3, 0, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 0.18.
 api_minimum_version = (0, 18, 0)

=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py	2008-02-06 00:41:04 +0000
+++ b/bzrlib/symbol_versioning.py	2008-02-13 03:25:53 +0000
@@ -44,6 +44,7 @@
            'one_zero',
            'one_one',
            'one_two',
+           'one_three',
            ]
 
 from warnings import warn
@@ -69,6 +70,7 @@
 zero_ninetythree = one_zero # Maintained for backwards compatibility
 one_one = "%s was deprecated in version 1.1."
 one_two = "%s was deprecated in version 1.2."
+one_three = "%s was deprecated in version 1.3."
 
 def set_warning_method(method):
     """Set the warning method to be used by this module.