4
4
This document describes the processes for making and announcing a Bazaar
5
5
release, and managing the release process. This is just one phase of the
6
`overall development cycle <http://doc.bazaar-vcs.org/developers/cycle.html>`_,
7
but it's the most complex part.
8
This document gives a checklist you can follow from start to end in one
6
`overall development cycle
7
<http://doc.bazaar.canonical.com/developers/cycle.html>`_, (go re-read this
8
document to ensure it hasn't been updated since you last read it) but it's
11
If you're doing your first release you can follow this document and read
12
each step explanation. It's also a good practice to read it for any release
13
to ensure you don't miss a step and to update it as the release process
11
16
If you're helping the Release Manager (RM) for one reason or another, you
12
17
may notice that he didn't follow that document scrupulously. He may have
13
18
good reasons to do that but he may also have missed some parts.
15
Follow the document yourself and don't hesitate to create the missing
16
milestones for example (we tend to forget these ones a lot).
26
#. PQM access rights (or you won't be able to land any change)
24
28
#. Download the pqm plugin and install it into your ``~/.bazaar/plugins``::
26
30
bzr branch lp:bzr-pqm ~/.bazaar/plugins/pqm
32
#. Alternatively, you can download and install ``lp:hydrazine`` (the main
33
difference is that hydrazine requires the branch to land to be hosted on
39
In this document, we're talking about source releases only, packages and
40
installers are built from this but we won't talk about them here.
42
Every release is part of a series, ``bzr-2.4.1`` is part of series ``2.4``.
44
We do two different kind of releases: the betas releases and the stable
45
releases for a given series.
47
For a given series, releases will be done to deliver new versions of bzr to
48
different kinds of users:
50
#. beta releases: named ``x.ybn`` where ``x.y`` is the series and ``n``
51
starts at 1 and is incremented. These releases are targeted to beta
52
testers who don't want to run from source but are interested in features
55
#. stable releases: name ``x.y.z`` where ``x.y.`` is the series and ``z``
56
starts at 1 and is incremented. These releases are targeted at people
57
that want bugfixes only and no new features.
60
Differences in the release process between beta and stable release will be
61
mentioned when needed.
66
As of July 2011, we maintain four series (and one that is about to be EOLed).
67
Concurrently releasing them all at the same time makes it harder to shorten
68
the delay between the source availability and the package building longer
69
than necessary (we delay the official announcement until most of our users
70
can install the new release).
72
In order to continue to do time-based releases, we need to plan the
73
releases by series to minimize the collisions. In the end, it's the Release
74
Manager call to decide whether he prefers to do all releases at once
75
though, so the rules presented here are a conservative approach.
77
We want to respect the following rules:
79
#. as much as possible releases should not disturb development, and
80
ongoing development should not disturb releases,
82
#. the most recent development series should release once a month during
83
the beta period (see `Development cycles <cycle.html>`_ for more
86
#. the most recent stable series should release every other month (based
87
on the amount of bug fixes, this can be shorter or longer depending on
90
#. previous series should release on a regular basis without interfering
91
with the most recent series with a decreasing order of priority (again
92
this should be based on bugs importance and user feedback),
94
#. the death of a series should be planned ahead of time. 6 months should
95
give enough time to our users to migrate to a more recent series. This
96
doesn't mean we will make a release at the end of the series, just that
97
before the end date we *could* possibly put out another release if
98
there was a sufficiently important fix. Beyond that date, we won't
99
even land changes on that branch (unless something causes a miraculous
102
#. there should not be more than 2 releases in the same week (but the
103
Release Manager is free to ignore this (get in touch with packagers
106
#. the series are aligned with Ubuntu releases for convenience since we
107
create a new series every 6 months. This means that we support the
108
stable series for 18 months. Note that we also propose the most recent
109
stable series via the stable PPA but that the SRU processs allow us to
110
reach a wider audience.
112
At the start of a series cycle
113
==============================
115
To start a new series cycle:
117
#. Create a new series ``x.y`` at <https://launchpad.net/bzr/+addseries>.
119
#. Add milestones at <https://launchpad.net/bzr/x.y/+addmilestone> to that
120
series for the beta releases and the stable series mentioning their
121
expected dates. Only the milestone associated to the next release in
122
this series should be left active to avoid clutter when targeting bugs.
124
#. If you made a new series, you will need to create a new pqm-controlled
125
branch for this release series. This branch will be used only from the
126
first non-beta release onwards. It needs to be created by a Canonical
127
sysadmin (ask the core devs for instructions or to do it for you).
129
#. Start a new release-notes file::
131
cd doc/en/release-notes
132
cp series-template.txt bzr-x.y.txt # e.g. bzr-2.3.txt
135
#. Start a new whats-new file::
138
cp template.txt bzr-x.y.txt # e.g. bzr-2.6.txt
142
At the start of a release cycle
143
===============================
32
145
To start a new release cycle:
34
#. Create a new series at <https://launchpad.net/bzr/+addseries>. There is one
35
series for every *x.y* release.
37
#. Go to the series web page at <https://launchpad.net/bzr/x.y>
39
#. Create a new release at
40
<https://launchpad.net/bzr/x.y/+addrelease> and add
41
information about this release. We will not use it yet, but it
42
will be available for targeting or nominating bugs.
44
#. We create a new pqm-controlled branch for this release series, by
45
asking a Canonical sysadmin.
46
This branch means that from the first release beta or candidate onwards,
47
general development continues on the trunk, and only
48
specifically-targeted fixes go into the release branch.
50
#. Add milestones at <https://edge.launchpad.net/bzr/x.y/+addmilestone> to
51
that series for the beta release, release candidate and the final release,
52
and their expected dates.
54
#. Update the version number in the ``bzr`` script, and the
55
``bzrlib/__init__.py`` file. Make sure there is always a corresponding
56
milestone when you change that version number.
58
#. Add a new section at the top of ``NEWS`` about the new release,
59
including its version number and the headings from
60
``NEWS-template.txt``.
62
147
#. Send mail to the list with the key dates, who will be the release
63
148
manager, and the main themes or targeted bugs. Ask people to nominate
64
149
objectives, or point out any high-risk things that are best done early,
65
150
or that interact with other changes. This is called the metronome mail
66
151
and is described in `Development cycles <cycle.html>`_.
68
#. Make a local branch for preparing this release. (Only for the first
69
release in a series, otherwise you should already have a branch.) ::
71
bzr branch trunk prepare-1.14
153
#. Make a local branch to prepare the release::
155
bzr branch lp:bzr/x.y x.y-dev
157
If you're doing your first beta release, branch from trunk::
159
bzr branch lp:bzr x.y-dev
161
Note that you will generally reuse the same branch for all releases in a
73
164
#. Configure pqm-submit for this branch, with a section like this (where
74
x.y is the version to release).
75
``~/.bazaar/locations.conf``::
165
``x.y`` is the series for your release). **Or use hydrazine for easier
166
setup** ``~/.bazaar/locations.conf``::
77
[/home/mbp/bzr/prepare-x.y]
168
[/home/mbp/bzr/x.y-dev]
78
169
pqm_email = Canonical PQM <pqm@bazaar-vcs.org>
79
170
submit_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y
80
171
parent_branch = http://bazaar.launchpad.net/~bzr-pqm/bzr/x.y
81
public_branch = http://bazaar.example.com/prepare-x.y
172
public_branch = http://bazaar.example.com/x.y-dev
82
173
submit_to = bazaar@lists.canonical.com
83
174
smtp_server = mail.example.com:25
85
Please see <http://doc.bazaar-vcs.org/developers/HACKING.html#an-overview-of-pqm>
176
Please see <http://doc.bazaar.canonical.com/developers/HACKING.html#an-overview-of-pqm>
86
177
for more details on PQM
179
#. Update the version number in the ``bzr`` script, and the
180
``bzrlib/__init__.py`` file::
182
version_info = (x, y, z, 'dev', 0)
184
#. Add a new section at the top of the current release notes (in
185
``doc/en/release-notes``) about the new release, including its version
186
number and the headings from ``release-template.txt``.
188
#. Update the "What's New" documents in ``doc/en/whats-new``.
190
#. Make sure a milestone exists for your release and that it is active,
191
<https://launchpad.net/bzr/x.y> lists the existing milestones,
192
<https://launchpad.net/bzr/x.y/x.y.z/+edit> allows you to toggle the
195
#. Commit this and send it to PQM.
198
Doing a particular release
199
==========================
201
Update the source code
202
----------------------
204
#. Check that there is a milestone for the release you're doing. If there
205
is no milestone it indicates a process problem - make the milestone but
206
also mail the list to raise this issue in our process. Milestones are
207
found at <https://launchpad.net/bzr/+milestone/x.y.z>.
88
209
#. In the release branch, update ``version_info`` in ``./bzrlib/__init__.py``.
89
210
Make sure the corresponding milestone exists.
90
211
Double check that ./bzr ``_script_version`` matches ``version_info``. Check
91
the output of ``bzr --version``.
212
the output of ``./bzr --version``.
93
214
For beta releases use::
216
version_info = (2, 1, 0, 'beta', SERIAL)
95
220
version_info = (2, 1, 0, 'beta', 1)
98
For release candidates use::
100
version_info = (2, 0, 1, 'candidate', 1)
103
Starting the release phase
104
--------------------------
106
#. Create a new milestone at <https://launchpad.net/bzr/x.y/+addmilestone>
107
for the beta release or release candidate if you haven't already.
109
#. Add the date and release number to ``./NEWS``
111
Depending on whether you're doing a beta or a bugfix release, you'll
112
have to create a NEWS section for your release in the right
113
place. Most of the time, the new section is at the top of the file
114
(look what have been done for the various 2.0x and 2.1.0bx releases).
115
The rule is to keep the sections sorted by date. You'll need to be
116
cautious when merging back to trunk to respect that.
118
#. To check that all bugs mentioned in ``./NEWS`` are actually marked as
119
closed in Launchpad, you can run ``tools/check-newsbugs.py``::
121
./tools/check-newsbugs.py NEWS
123
(But note there can be some false positives, and this script may be
124
flaky <https://bugs.edge.launchpad.net/bzr/+bug/354985>. Don't let
125
this slow you down too much.)
127
#. Summarize into one or two paragraphs what's new in this release.
222
For stable releases use::
224
version_info = (2, 1, 2, 'final', 0)
226
#. Update the ``./doc/en/release-notes/`` section for this release.
228
Fill out the date and a description of the release under the existing
229
header. If there isn't one, follow the instructions above for using the
230
``release-template.txt`` file.
232
See *2.1.1* or similar for an example of what this looks like.
234
#. Add or check the summary of the release into the "What's New" document.
236
#. To check that all bugs mentioned in the release notes are actually
237
marked as closed in Launchpad, you can run
238
``tools/check-newsbugs.py``::
240
./tools/check-newsbugs.py doc/en/release-notes/bzr-x.y.txt
242
As of 2011-07-18, all bugs mentioned in the output of the script requires
243
some sort of intervention (either changing the status if it's not 'Fix
244
Released' or setting a different milestone if the bug hasn't been
245
fixed). A few false positives may remain in the older series, don't let
246
this slow you down too much. This script accepts options you may find
247
useful, use ``./tools/check-newsbugs.py`` to display its usage.
249
#. For beta releases update the translation template::
253
This is especially important for the final beta release which is
254
when translations are frozen and translators are requested to make
257
#. For stable releases update the translations::
259
bzr merge lp:~bzr-core/bzr/bzr-translations-export-x.y
129
261
#. Commit these changes to the release branch, using a command like::
131
bzr commit -m "Release 1.14."
263
bzr commit -m "Release 2.3.1"
133
265
The diff before you commit will be something like::
135
=== modified file 'NEWS'
136
--- NEWS 2008-09-17 23:09:18 +0000
137
+++ NEWS 2008-09-23 16:14:54 +0000
145
+This release includes many bug fixes and a few performance and feature
146
+improvements. ``bzr rm`` will now scan for missing files and remove them,
147
+like how ``bzr add`` scans for unknown files and adds them. A bit more
148
+polish has been applied to the stacking code. The b-tree indexing code has
149
+been brought in, with an eye on using it in a future repository format.
150
+There are only minor installer changes since bzr-1.7rc2.
152
bzr 1.7rc2 2008-09-17
153
---------------------
156
=== modified file 'bzrlib/__init__.py'
157
--- bzrlib/__init__.py 2008-09-16 21:39:28 +0000
158
+++ bzrlib/__init__.py 2008-09-23 16:14:54 +0000
160
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
161
# releaselevel of 'dev' for unreleased under-development code.
163
-version_info = (1, 7, 0, 'candidate', 2)
164
+version_info = (1, 7, 0, 'final', 0)
167
# API compatibility version: bzrlib is currently API compatible with 1.7.
267
=== modified file 'bzrlib/__init__.py'
268
--- bzrlib/__init__.py 2011-02-09 06:35:00 +0000
269
+++ bzrlib/__init__.py 2011-03-10 10:24:47 +0000
271
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
272
# releaselevel of 'dev' for unreleased under-development code.
274
-version_info = (2, 3, 1, 'dev', 0)
275
+version_info = (2, 3, 1, 'final', 0)
277
# API compatibility version
278
api_minimum_version = (2, 3, 0)
280
=== modified file 'doc/en/release-notes/bzr-2.3.txt'
281
--- doc/en/release-notes/bzr-2.3.txt 2011-03-09 08:30:16 +0000
282
+++ doc/en/release-notes/bzr-2.3.txt 2011-03-10 10:40:47 +0000
287
-:2.3.1: NOT RELEASED YET
289
-External Compatibility Breaks
290
-*****************************
292
-.. These may require users to change the way they use Bazaar.
297
-.. New commands, options, etc that users may wish to try out.
302
-.. Improvements to existing commands, especially improved performance
303
- or memory usage, or better results.
306
+This is a bugfix release. Upgrading is recommended for all users of earlier
312
=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
313
--- doc/en/whats-new/whats-new-in-2.3.txt 2011-02-03 16:29:18 +0000
314
+++ doc/en/whats-new/whats-new-in-2.3.txt 2011-03-10 11:10:36 +0000
316
improvements made to the core product, it highlights enhancements within the
317
broader Bazaar world of potential interest to those upgrading.
319
-Bazaar 2.3.0 is fully compatible both locally and on the network with 2.0 2.1,
320
-and 2.2, and can read and write repositories generated by all previous
321
+Bazaar 2.3.1 includes all the fixes in the un-released 2.0.7, 2.1.4 and 2.2.5
322
+versions that weren't included in 2.3.0 and fixes some bugs on its own.
324
+See the :doc:`../release-notes/index` for details.
326
+Bazaar 2.3 is fully compatible both locally and on the network with 2.0, 2.1,
327
+and 2.2. It can read and write repositories generated by all previous
169
333
#. Tag the new release::
173
#. Push those changes to a bzr reposistory that is public and accessible on
174
the Internet. PQM will pull from this repository when it attempts to merge
175
your changes. Then submit those changes to PQM for merge into the
176
appropriate release branch::
337
#. Push those changes to a bzr branch that is public and accessible on the
338
Internet. PQM will pull from this branch when it attempts to merge your
339
changes. Then submit those changes to PQM for merge into the appropriate
179
bzr pqm-submit -m "(mbp) prepare 1.14"
343
bzr pqm-submit -m "(vila) Release 2.3.1 (Vincent Ladeuil)"
347
bzr lp-propose -m "Release 1.14" --approve lp:bzr/1.14
181
350
#. When PQM succeeds, pull down the master release branch.
191
360
#. Now we'll try expanding this tarball and running the test suite
192
361
to check for packaging problems::
194
make check-dist-tarball
196
You may encounter failures while running the test suite caused
197
by your locally installed plugins. Use your own judgment to
198
decide if you can release with these failures. When in doubt,
199
disable the faulty plugins one by one until you get no more
363
make check-dist-tarball | subunit2pyunit
365
You may encounter failures while running the test suite caused by your
366
locally installed plugins. Use your own judgment to decide if you can
367
release with these failures. When in doubt, disable the faulty plugins
368
one by one until you get no more failures. Alternatively, you can use
369
``BZR_DISABLE_PLUGINS`` or ``BZR_PLUGIN_PATH=-site`` to disable one or
372
Until <http://pad.lv/839461> is fixed, you may encounter issues if you
373
cut a release for old stable branches (<= 2.2) and use a more recent
374
OS/distro. If that's the case, check the bug status and use the following
375
workaround if no fix is available::
377
export TTPATH=<local branch of lp:testtools -r 0.9.2>
378
export SUPATH=<local branch of lp:subunit -r 0.0.6>
379
PYTHONPATH=$TTPATH:$SUPATH/python PATH=$SUPATH/filters:${PATH} BZR_PLUGIN_PATH=-site make check-dist-tarball PYTHON=python2.6 | subunit2pyunit
381
Remember that PQM has just tested everything too, this step is
382
particularly testing that the pyrex extensions, which are updated
383
by your local pyrex version when you run make dist, are in good
203
387
Publishing the source tarball
204
388
-----------------------------
206
#. Go to the relevant milestone page in Launchpad.
208
#. Within that release, upload the source tarball and the GPG
209
signature. Or, if you prefer, use the
210
``tools/packaging/lp-upload-release`` script to do this.
390
#. Go to the relevant <https://launchpad.net/bzr/x.y> series page in Launchpad.
392
#. Create a release of the milestone, and upload the source tarball and
393
the GPG signature. Or, if you prefer, use the
394
``tools/packaging/lp-upload-release`` script to do this. Note that
395
this changes what the download widget on the Launchpad bzr home
396
page shows, so don't stop the release process yet, or platform binary
397
installers won't be made and the download list will stay very small!
398
<https://bugs.launchpad.net/launchpad/+bug/586445>
401
Kick off the next cycle
402
-----------------------
404
From that point, there is no possible return, the tarball has been uploaded
405
so you can relax a bit.
407
You're still holding a "social" lock on the launchpad branch though. Until
408
your start the next cycle, nobody should land anything on this branch. If
409
they do, they either targeted the wrong branch or didn't update the news
410
file correctly, so the sooner the branch is opened again, the better.
412
This matters more for ``lp:bzr`` than for ``lp:bzr/x.y``, ``lp:bzr`` should
413
always be open for landing, so you should do `At the start of a release
414
cycle`_ as soon as possible (i.e. update the version number in ``bzr`` and
415
``bzrlib/__init__``, create/update the news files and create/update the
416
milestone for the next relase).
418
You may also need to do `At the start of a series cycle`_ if you're starting
421
The final beta - branching and translations
422
-------------------------------------------
424
A word of caution: the instructions above works well for all releases but
425
there is one special case that requires a bit more care: when you release
426
the *last* beta for a given ``x.y`` series (from trunk aka lp:bzr), you need
427
to setup *two* branches for the next cycle:
429
#. ``lp:bzr`` needs to be opened for the next *series* ``x.(y+1)``
431
#. ``lp:bzr/x.y`` needs to be opened for the next *release* ``x.y.0`` in the
432
series. Since this is first real use of ``lp:bzr/x.y``, this is also the
433
deadline for the PQM branch to be created.
435
Both are important as ``lp:bzr`` should remain open so any change can be
436
landed, ``lp:bzr/x.y`` on the other hand should be ready to receive bug
439
``lp:bzr`` is generally more important as the bug fixes on ``lp:bzr/x.y``
440
won't be released sooner than a month from now whereas people may already
441
been waiting to land on ``lp:bzr``.
445
#. Create or update the ``x.y`` PQM branch based on whatever
446
revision you want to release
448
#. Open ``lp:bzr`` for ``x.(y+1)``
450
#. Release ``x.y.0`` from ``lp:bzr/x.y``
452
#. Open ``lp:bzr/x.y`` for bug fixes
454
You also need to ensure Launchpad is set up to import/export
455
translations for the new branch and inform translators.
459
bzr push lp:~bzr-core/bzr/bzr-translations-export-x.y
461
#. On the translations series synchronization settings page
462
<https://translations.launchpad.net/bzr/x.y/+translations-settings>
463
turn on ``Import template files`` then for exports click ``Choose a
464
target branch`` and point it at the branch you just pushed.
466
#. E-mail translators to announce that the forthcoming stable release
467
of bzr is ready for translations. Send to
468
``translators@lists.launchpad.net`` and
469
``ubuntu-translators@lists.ubuntu.com``.
471
#. The series is now frozen for strings and API, see below for adding
472
that to the announcement.
213
474
Announcing the source freeze
214
475
----------------------------
216
#. Post to the ``bazaar`` list, saying that the source has been frozen.
217
This is the cue for platform maintainers and plugin authors to update
218
their code. This is done before the general public announcement of the
477
#. Post to the ``bazaar`` list, saying that the source has been frozen
478
(gone gold). Be extra clear that this is only a *source* release
479
targeted at packagers and installer builders (see
480
<https://bugs.launchpad.net/launchpad/+bug/645084>). This is the cue
481
for platform maintainers and plugin authors to update their code. This
482
is done before the general public announcement of the release.
484
The freeze announcement generally guess the date of the official public
485
announcement, for the most recent stable series (the one supported by the
486
installers and most of the distributions) it's generally a few days after
487
the freeze. For older series supported only via SRUs for Ubuntu, we don't
488
control the process as tightly so guessing the date is not appropriate.
490
For the final beta release include in your announcement a notice of
491
API and translation freezes nothing that public methods should not
492
be removed or changed and strings should not be added or changed.
494
#. Pause for a few days.
222
497
Publishing the release
271
538
The announce mail will look something like this::
273
Subject: bzr x.yy released!
275
<<Summary paragraph from news>>
540
Subject: bzr x.y.z released!
277
542
The Bazaar team is happy to announce availability of a new
278
543
release of the bzr adaptive version control system.
279
Bazaar is part of the GNU system <http://gnu.org/>.
545
Bazaar <http://bazaar.canonical.com/> is part of the GNU project
546
<http://gnu.org/> to produce a free operating system.
548
<<Summary paragraph from news>>
281
550
Thanks to everyone who contributed patches, suggestions, and
284
553
Bazaar is now available for download from
285
http://bazaar-vcs.org/Download as a source tarball; packages
554
https://launchpad.net/bzr/x.y/x.y.z/ as a source tarball; packages
286
555
for various systems will be available soon.
288
<<NEWS section from this release back to the last major release>>
557
<<release notes from this release back to the last major release>>
290
559
Feel free to tweak this to your taste.
292
561
#. Make an announcement through <https://launchpad.net/bzr/+announce>
294
#. Update the IRC channel topic. Use the ``/topic`` command to do this,
295
ensuring the new topic text keeps the project name, web site link, etc.
297
563
#. Announce on http://freshmeat.net/projects/bzr/
299
This should be done for beta releases, release candidates and final
300
releases. If you do not have a Freshmeat account yet, ask one of the
565
This should be done for beta releases and stable releases. If you do not
566
have a Freshmeat account yet, ask one of the existing admins.
568
The purpose here is to point users to the latest stable release
569
(i.e. SRUs are excluded) while still publishing announcements for beta
572
There are several kinds of modifications that could be done there via the
573
``Administration`` box in the lower right area of the page:
575
* Edit the project: This is where most of the URLs proposed in the
576
``Links`` box are edited. This should rarely change except for the URLs
577
related to the latest stable release.
579
* New announcement: When doing a release, put the summary of the release
580
(you can't embed URLs there, the moderation staff remove them). Users
581
can still access the releases notes via the ``Release Notes`` URL in
582
the ``Links`` box in the upper right area of the page. When doing the
583
first stable release in a series, delete the ``Unstable installers``
584
<https://launchpad.net/bzr/x.y/x.ybn> and ``Unstable source tarball``
585
<http://launchpad.net/bzr/x.y/x.ybn/+download/bzr-x.ybn.tar.gz>
586
links. Conversely, when creating the first beta in a development
587
series, create these links again. Check all links when doing other
590
* Set direct download: When releasing a new stable release, this should
591
point to the corresponding launchpad page:
592
<https://launchpad.net/bzr/x.y/x.y.z/>
303
594
#. Update `<http://en.wikipedia.org/wiki/Bazaar_(software)>`_ -- this should
304
be done for final releases but not for beta releases or Release Candidates.
595
be done for the stable and beta releases.
306
597
#. Update the python package index: <http://pypi.python.org/pypi/bzr> - best
307
598
done by running ::
309
600
python setup.py register
311
Remember to check the results afterwards.
602
Remember to check the results afterward -- this should be done for
603
stable releases but not for beta releases nor SRUs.
313
605
To be able to register the release you must create an account on
314
606
<http://pypi.python.org/pypi> and have one of the existing owners of
318
610
Merging the released code back to trunk
319
611
---------------------------------------
321
Merge the release branch back into the trunk. Check that changes in NEWS
322
were merged into the right sections. If it's not already done, advance
323
the version number in ``bzr`` and ``bzrlib/__init__.py``. Submit this
324
back into pqm for bzr.dev.
613
Merge the release branch back into the trunk. The ``doc/en/release-notes``
614
changes should be merged into the right place because each release series
615
has its own release-notes file, but double-check.
617
If it's not already done, advance the version number in ``bzr`` and
618
``bzrlib/__init__.py``. Submit this back into pqm for bzr.dev.
326
620
As soon as you change the version number in trunk, make sure you have
327
621
created the corresponding milestone to ensure the continuity in bug
328
622
targeting or nominating. Depending on the change, you may even have to
329
623
create a new series (if your change the major or minor release number), in
330
that case go to `Starting a cycle` and follow the instructions from there.
624
that case go to `At the start of a series cycle`_ and follow the
625
instructions from there.
332
You should also merge (not pull) the release branch into
333
``lp:~bzr/bzr/current``, so that branch contains the current released code
336
628
Releases until the final one
337
629
----------------------------
339
Congratulations - you have made your first release. Have a beer
340
or fruit juice - it's on the house! If it was a beta, or
341
candidate, you're not finished yet. Another beta or candidate or
342
hopefully a final release is still to come.
344
The process is the same as for the first release. Goto `Starting the
345
release phase`_ and follow the instructions again. Some details change
346
between beta, candidate and final releases, but they should be
347
documented. If the instructions aren't clear enough, please fix them.
631
Congratulations - you have made your first release. Have a beer or fruit
632
juice - it's on the house! If it was a beta, you're not finished
633
yet. Another beta or hopefully a stable release is still to come.
635
The process is the same as for the first release. Goto `Doing a particular
636
release`_ and follow the instructions again. Some details change between
637
beta and stable releases, but they should be documented. If the instructions
638
aren't clear enough, please fix them.
641
Getting the release into Ubuntu
642
-------------------------------
644
(Feel free to propose or add new sections here about what we should do to
645
get bzr into other places.)
647
For the currently-under-development release of Ubuntu, no special action
648
is needed: the release should be picked by Debian and synced from there into
651
Releases off stable bzr branches should go in to the ``-updates`` of the
652
Ubuntu release that originally contained that branch. (Ubuntu Lucid had
653
bzr 2.2.0, so should get every 2.2.x update.) This means going through
654
the `SRU (Stable Release Updates)
655
<https://wiki.ubuntu.com/StableReleaseUpdates>`__ process.
657
Since September 2010, bzr has received approval by the technical
658
board for the `MicroReleaseExceptions
659
<https://wiki.ubuntu.com/StableReleaseUpdates/MicroReleaseExceptions>`__
660
category so that whole bugfix releases can more easily be
663
Progress on these realeases is tracked on the `SRU wiki
664
<http://wiki.bazaar.canonical.com/UbuntuStableReleaseUpdates>`_
667
**After making a bzr stable-release release, nominate the most serious bug
668
for the appropriate Ubuntu release and subscribe the `ubuntu-sru` team.**
670
This requires a couple of tricks (please reconsider and tweak as things
671
evolves from one release to the other):
673
* create a distro task with the ``Also affects distribution`` button and
674
select ``bzr (Ubuntu)``.
676
* change the *URL* to point to ``ubuntu/+source/bzr`` instead of ``bzr``
677
(this is needed if you create the distro task but not if it exists
678
already). You should now be able to click the ``Nominate for release``
679
button and select the right Ubuntu release. As of September 2010, this
682
* ``oneiric`` for the 2.4 series,
683
* ``natty`` for the 2.3 series,
684
* ``maverick`` for the 2.2 series,
685
* ``lucid`` for the 2.1 series,
687
* Subscribe the ``~ubuntu-sru`` team to the bug.
689
* Add a comment targeted to ``~ubuntu-sru`` explaining the expectations
690
(we are targeting running the test suite during the build which, as of
691
September 2010, fails for known reasons that are currently addressed).
692
Search for bugs tagged with ``sru`` for examples and don't forget to tag
693
the bug you selected.
added
removed
doc/developers/releasing.txt
