Rev 4370: (tanner) merge bzr-1.15rc1 to trunk. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4370
revision-id: pqm at pqm.ubuntu.com-20090516091716-x8ozyp5uuvsgmsfg
parent: pqm at pqm.ubuntu.com-20090515112941-ajpr1cci95j47aje
parent: tanner at real-time.com-20090516082111-gx9dvo4ob1ptblkj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-05-16 10:17:16 +0100
message:
  (tanner) merge bzr-1.15rc1 to trunk.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 4369.1.1
    revision-id: tanner at real-time.com-20090516082111-gx9dvo4ob1ptblkj
    parent: pqm at pqm.ubuntu.com-20090515112941-ajpr1cci95j47aje
    parent: tanner at real-time.com-20090516071910-vx2yv1d6pkduc14e
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: bzr.dev
    timestamp: Sat 2009-05-16 03:21:11 -0500
    message:
      Merge 1.15rc1 back to trunk
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 4360.3.1
    tags: bzr-1.15rc1
    revision-id: tanner at real-time.com-20090516071910-vx2yv1d6pkduc14e
    parent: pqm at pqm.ubuntu.com-20090513232416-vt21661225sx5v8m
    committer: Robert J. Tanner <tanner at real-time.com>
    branch nick: bzr.1.15
    timestamp: Sat 2009-05-16 02:19:10 -0500
    message:
      Release 1.15rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2009-05-14 09:38:39 +0000
+++ b/NEWS	2009-05-16 08:21:11 +0000
@@ -9,6 +9,15 @@
 In Development
 ##############
 
+bzr 1.15
+########
+:1.15rc1: 2009-04-06
+
+The smart server will no longer raise 'NoSuchRevision' when streaming content
+with a size mismatch in a reconstructed graph search. New command ``bzr
+dpush``. Plugins can now define their own annotation tie-breaker when two
+revisions introduce the exact same line.
+
 Compatibility Breaks
 ********************
 

=== modified file 'bzr'
--- a/bzr	2009-05-13 19:26:14 +0000
+++ b/bzr	2009-05-16 08:21:11 +0000
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 15, 0)
+_script_version = (1, 16, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-05-04 00:09:26 +0000
+++ b/bzrlib/__init__.py	2009-05-16 08:21:11 +0000
@@ -50,7 +50,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, 15, 0, 'dev', 0)
+version_info = (1, 16, 0, 'dev', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.13.
 api_minimum_version = (1, 15, 0)