Rev 3698: (jam) Merge in bzr-1.7rc1, open bzr-1.8 for development. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3698
revision-id: pqm at pqm.ubuntu.com-20080910053334-fy7gihd6da2nyhy2
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: john at arbash-meinel.com-20080910045457-abzebw04q75dtprs
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-09-10 06:33:34 +0100
message:
  (jam) Merge in bzr-1.7rc1, open bzr-1.8 for development.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3697.4.1
    revision-id: john at arbash-meinel.com-20080910045457-abzebw04q75dtprs
    parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
    parent: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2008-09-09 23:54:57 -0500
    message:
      Merge in bzr 1.7rc1, open 1.8 for development
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3697.2.2
    revision-id: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
    parent: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
    parent: john at arbash-meinel.com-20080910034639-peesekud7vl6cpty
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.7
    timestamp: Wed 2008-09-10 05:17:20 +0100
    message:
      Fix up NEWS for 1.7rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3697.3.1
        revision-id: john at arbash-meinel.com-20080910034639-peesekud7vl6cpty
        parent: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2008-09-09 22:46:39 -0500
        message:
          Fix NEWS for proper 1.7rc1 release.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3697.2.1
    revision-id: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
    parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
    parent: john at arbash-meinel.com-20080909212730-xka2luwpzvz2o4f0
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.7
    timestamp: Tue 2008-09-09 23:07:19 +0100
    message:
      (jam) Prepare 1.7rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3697.1.1
    revision-id: john at arbash-meinel.com-20080909212730-xka2luwpzvz2o4f0
    parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Tue 2008-09-09 16:27:30 -0500
    message:
      Prepare 1.7rc1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2008-09-06 10:25:39 +0000
+++ b/NEWS	2008-09-10 04:54:57 +0000
@@ -9,6 +9,34 @@
 
   CHANGES:
 
+  FEATURES
+
+  IMPROVEMENTS:
+
+  BUG FIXES:
+
+  DOCUMENTATION:
+
+  API CHANGES:
+
+  TESTING:
+
+  INTERNALS:
+
+
+bzr 1.7rc1 2008-09-09
+---------------------
+
+This release candidate for bzr 1.7 has several bug fixes and a few
+performance and feature improvements.  ``bzr rm`` will now scan for
+missing files and remove them, like how ``bzr add`` scans for unknown
+files and adds them. A bit more polish has been applied to the stacking
+code. The b-tree indexing code has been brought in, with an eye on using
+it in a future repository format.
+
+
+  CHANGES:
+
     * ``bzr export`` can now export a subdirectory of a project.
       (Robert Collins)
 

=== modified file 'bzr'
--- a/bzr	2008-08-29 19:32:00 +0000
+++ b/bzr	2008-09-10 04:54:57 +0000
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 7, 0)
+_script_version = (1, 8, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-09-05 20:14:06 +0000
+++ b/bzrlib/__init__.py	2008-09-10 04:54:57 +0000
@@ -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, 7, 0, 'dev', 0)
+version_info = (1, 8, 0, 'dev', 0)
 
 
 # API compatibility version: bzrlib is currently API compatible with 1.7.