Merge lp:~vila/brz/prepare-3.0.0 into lp:brz

[Vincent Ladeuil]

Release 3.0a1

This will be used to cut the alpha tarball.

[Vincent Ladeuil (vila)]

RM approval ;)

review: Approve

=== modified file 'breezy/__init__.py'
--- breezy/__init__.py	2018-07-20 00:49:12 +0000
+++ breezy/__init__.py	2018-09-16 09:47:08 +0000
@@ -51,7 +51,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 = (3, 0, 0, 'dev', 1)
+version_info = (3, 0, 0, 'alpha', 1)
 
 def _format_version_tuple(version_info):
     """Turn a version number 2, 3 or 5-tuple into a short string.

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2018-09-15 13:28:30 +0000
+++ doc/developers/releasing.txt	2018-09-16 09:47:08 +0000
@@ -281,7 +281,7 @@
 
 #. Commit these changes to the release branch, using a command like::
 
-     brz commit -m "Release 2.3.1"
+     brz commit -m "Release 3.0.0"
 
    The diff before you commit will be something like::
 
@@ -361,7 +361,7 @@
 
    Use a commit message formatted like::
   
-     (vila) Release 3.0.0 (Vincent Ladeuil)
+     Release 3.0.0
 
    Note that ``brz push`` should mention updating one tag (which you just
    created). If it doesn't, double-check that you created (and pushed) this

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2018-06-23 13:39:04 +0000
+++ doc/en/release-notes/brz-3.0.txt	2018-09-16 09:47:08 +0000
@@ -13,16 +13,16 @@
 #########
 
 :Codename: Pelican
-:3.0.1: NOT RELEASED YET
+:3.0.0: NOT RELEASED YET
 
 External Compatibility Breaks
 *****************************
 
- * The bzr command has been renamed to brz, to prevent
-   clashes with upstream Bazaar.
+ * The bzr command has been renamed to brz, to prevent clashes with upstream
+   Bazaar.
    (Martin Packman, Jelmer Vernooij)
 
- * The --prefix/-p argument for ``bzr diff`` now defaults to -p1 rather
+ * The --prefix/-p argument for ``brz diff`` now defaults to -p1 rather
    than -p0. (Jelmer Vernooij, #1695126)
 
  * The ``brz register-branch`` command from the Launchpad plugin has been
@@ -70,21 +70,21 @@
 New Features
 ************
 
- * The 'bisect' plugin is now shipped with bzr. (Jelmer Vernooij)
-
- * The 'fastimport' plugin is now bundled with Bazaar.
-   (Jelmer Vernooij)
-
- * The 'stats' plugin is now bundled with Bazaar.
-   (Jelmer Vernooij)
-
- * The 'upload' plugin is now bundled with Bazaar.
-   (Jelmer Vernooij)
-
- * The 'cvs' and 'mtn' plugins are now bundled with Bazaar.
-   (Jelmer Vernooij)
-
- * The 'email' plugin is now bundled with Bazaar.
+ * The 'bisect' plugin is now shipped with brz. (Jelmer Vernooij)
+
+ * The 'fastimport' plugin is now bundled with Breezy.
+   (Jelmer Vernooij)
+
+ * The 'stats' plugin is now bundled with Breezy.
+   (Jelmer Vernooij)
+
+ * The 'upload' plugin is now bundled with Breezy.
+   (Jelmer Vernooij)
+
+ * The 'cvs' and 'mtn' plugins are now bundled with Breezy.
+   (Jelmer Vernooij)
+
+ * The 'email' plugin is now bundled with Breezy.
    (Jelmer Vernooij)
 
  * The 'import' command is now bundled with brz.
@@ -123,7 +123,7 @@
  * The ``repodebug`` plugin is now bundled.
    (Jelmer Vernooij)
 
- * New ``bzr cp`` command which copies files (but does not currently track
+ * New ``brz cp`` command which copies files (but does not currently track
    history). (Jelmer Vernooij, start towards #269095)
 
  * HPSS calls for ``RevisionTree.archive`` and
@@ -149,7 +149,7 @@
   (Jelmer Vernooij, #796582, #403811, #694946, #268135, #299879)
 
 * Print a proper error when encountering ghost revisions in
-  mainline in ``bzr log``. (Jelmer Vernooij, #726466)
+  mainline in ``brz log``. (Jelmer Vernooij, #726466)
 
 * Security fix: hostnames starting with a dash in bzr+ssh URLs
   are now filtered out when using a subprocess SSH client.