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

Proposed by Vincent Ladeuil on 2018-09-16
Status: Merged
Approved by: Vincent Ladeuil on 2018-09-16
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~vila/brz/prepare-3.0.0
Merge into: lp:brz
Diff against target: 114 lines (+24/-24)
3 files modified
breezy/__init__.py (+1/-1)
doc/developers/releasing.txt (+2/-2)
doc/en/release-notes/brz-3.0.txt (+21/-21)
To merge this branch: bzr merge lp:~vila/brz/prepare-3.0.0
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2018-09-16
Review via email: mp+355003@code.launchpad.net

Commit message

Release 3.0a1

Description of the change

This will be used to cut the alpha tarball.

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

RM approval ;)

review: Approve
lp:~vila/brz/prepare-3.0.0 updated on 2018-09-16
7120. By Vincent Ladeuil on 2018-09-16

Release 3.0a1

Merged from https://code.launchpad.net/~vila/brz/prepare-3.0.0/+merge/355003

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/__init__.py'
2--- breezy/__init__.py 2018-07-20 00:49:12 +0000
3+++ breezy/__init__.py 2018-09-16 09:47:08 +0000
4@@ -51,7 +51,7 @@
5 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
6 # releaselevel of 'dev' for unreleased under-development code.
7
8-version_info = (3, 0, 0, 'dev', 1)
9+version_info = (3, 0, 0, 'alpha', 1)
10
11 def _format_version_tuple(version_info):
12 """Turn a version number 2, 3 or 5-tuple into a short string.
13
14=== modified file 'doc/developers/releasing.txt'
15--- doc/developers/releasing.txt 2018-09-15 13:28:30 +0000
16+++ doc/developers/releasing.txt 2018-09-16 09:47:08 +0000
17@@ -281,7 +281,7 @@
18
19 #. Commit these changes to the release branch, using a command like::
20
21- brz commit -m "Release 2.3.1"
22+ brz commit -m "Release 3.0.0"
23
24 The diff before you commit will be something like::
25
26@@ -361,7 +361,7 @@
27
28 Use a commit message formatted like::
29
30- (vila) Release 3.0.0 (Vincent Ladeuil)
31+ Release 3.0.0
32
33 Note that ``brz push`` should mention updating one tag (which you just
34 created). If it doesn't, double-check that you created (and pushed) this
35
36=== modified file 'doc/en/release-notes/brz-3.0.txt'
37--- doc/en/release-notes/brz-3.0.txt 2018-06-23 13:39:04 +0000
38+++ doc/en/release-notes/brz-3.0.txt 2018-09-16 09:47:08 +0000
39@@ -13,16 +13,16 @@
40 #########
41
42 :Codename: Pelican
43-:3.0.1: NOT RELEASED YET
44+:3.0.0: NOT RELEASED YET
45
46 External Compatibility Breaks
47 *****************************
48
49- * The bzr command has been renamed to brz, to prevent
50- clashes with upstream Bazaar.
51+ * The bzr command has been renamed to brz, to prevent clashes with upstream
52+ Bazaar.
53 (Martin Packman, Jelmer Vernooij)
54
55- * The --prefix/-p argument for ``bzr diff`` now defaults to -p1 rather
56+ * The --prefix/-p argument for ``brz diff`` now defaults to -p1 rather
57 than -p0. (Jelmer Vernooij, #1695126)
58
59 * The ``brz register-branch`` command from the Launchpad plugin has been
60@@ -70,21 +70,21 @@
61 New Features
62 ************
63
64- * The 'bisect' plugin is now shipped with bzr. (Jelmer Vernooij)
65-
66- * The 'fastimport' plugin is now bundled with Bazaar.
67- (Jelmer Vernooij)
68-
69- * The 'stats' plugin is now bundled with Bazaar.
70- (Jelmer Vernooij)
71-
72- * The 'upload' plugin is now bundled with Bazaar.
73- (Jelmer Vernooij)
74-
75- * The 'cvs' and 'mtn' plugins are now bundled with Bazaar.
76- (Jelmer Vernooij)
77-
78- * The 'email' plugin is now bundled with Bazaar.
79+ * The 'bisect' plugin is now shipped with brz. (Jelmer Vernooij)
80+
81+ * The 'fastimport' plugin is now bundled with Breezy.
82+ (Jelmer Vernooij)
83+
84+ * The 'stats' plugin is now bundled with Breezy.
85+ (Jelmer Vernooij)
86+
87+ * The 'upload' plugin is now bundled with Breezy.
88+ (Jelmer Vernooij)
89+
90+ * The 'cvs' and 'mtn' plugins are now bundled with Breezy.
91+ (Jelmer Vernooij)
92+
93+ * The 'email' plugin is now bundled with Breezy.
94 (Jelmer Vernooij)
95
96 * The 'import' command is now bundled with brz.
97@@ -123,7 +123,7 @@
98 * The ``repodebug`` plugin is now bundled.
99 (Jelmer Vernooij)
100
101- * New ``bzr cp`` command which copies files (but does not currently track
102+ * New ``brz cp`` command which copies files (but does not currently track
103 history). (Jelmer Vernooij, start towards #269095)
104
105 * HPSS calls for ``RevisionTree.archive`` and
106@@ -149,7 +149,7 @@
107 (Jelmer Vernooij, #796582, #403811, #694946, #268135, #299879)
108
109 * Print a proper error when encountering ghost revisions in
110- mainline in ``bzr log``. (Jelmer Vernooij, #726466)
111+ mainline in ``brz log``. (Jelmer Vernooij, #726466)
112
113 * Security fix: hostnames starting with a dash in bzr+ssh URLs
114 are now filtered out when using a subprocess SSH client.

Subscribers

People subscribed via source and target branches