@@ -54,10 +54,18 @@ under active development for all kinds of changes: new features, semantic
54
54
changes, performance improvements, bug fixes. As the name indicates, it
55
55
is the branch :ref: `checked out <checkout >` by default by Mercurial.
56
56
57
- Once a :ref: ` final ` release (say, 3.3) is made from the in-development branch , a
57
+ At some point during the life-cycle of a release , a
58
58
new :ref: `maintenance branch <maintbranch >` is created to host all bug fixing
59
59
activity for further micro versions (3.3.1, 3.3.2, etc.).
60
60
61
+ For versions 3.4 and before, this was conventionally done when the final
62
+ release was cut (for example, 3.4.0 final).
63
+
64
+ .. note ::
65
+ For the 3.5 release we're trying something new. We're creating the 3.5
66
+ maintenance branch at the time we enter beta (3.5.0 beta 1). This will
67
+ allow feature development for 3.6 to occur alongside the beta and release
68
+ candidate stabilization periods for 3.5.
61
69
62
70
.. _maintbranch :
63
71
@@ -110,7 +118,7 @@ Summary
110
118
There are 5 open branches right now in the Mercurial repository:
111
119
112
120
- the ``default `` branch holds the future 3.5 version and descends from ``3.4 ``
113
- (future RM: Larry Hastings)
121
+ (RM: Larry Hastings)
114
122
- the ``3.4 `` branch holds bug fixes for future 3.4.x maintenance releases
115
123
and descends from ``3.3 `` (RM: Larry Hastings)
116
124
- the ``3.3 `` branch holds security fixes for future 3.3.x security releases
@@ -162,6 +170,10 @@ downloaded the alpha and beta releases.
162
170
Being in beta can be viewed much like being in RC _ but without the extra overhead
163
171
of needing commit reviews.
164
172
173
+ Please see the note in the `In-development (main) branch `_ section above
174
+ for new information about the creation of the 3.5 maintenance branch during beta.
175
+
176
+
165
177
.. _rc :
166
178
167
179
Release Candidate (RC)
@@ -177,6 +189,17 @@ You **cannot** skip the peer review during an RC, no matter how small! Even if
177
189
it is a simple copy-and-paste change, **everything ** requires peer review from
178
190
a core developer.
179
191
192
+ .. note ::
193
+ For the 3.5 release we're trying something new. At the point that we reach 3.5.0
194
+ release candidate 1, the official release branch will no longer be hosted at
195
+ ``hg.python.org ``. Instead, 3.5.0 rc 1 through final will be hosted
196
+ by the 3.5 release manager on bitbucket.
197
+
198
+ Bugfixes for 3.5 should still be checked in to the 3.5 branch. However, if the
199
+ core developer responsible for the bugfix feels it should be merged into 3.5.0, they
200
+ will need to create a bitbucket "pull request" for this change. Any bugfixes not
201
+ merged into 3.5.0 in this way will be automatically shipped with 3.5.1.
202
+
180
203
.. _final :
181
204
182
205
Final
0 commit comments