Bazaar

Merge lp://staging/~mbp/bzr/doc-old into lp://staging/~bzr/bzr/trunk-old

  1. doc-old
  2. Merge into trunk-old
Proposed by Martin Pool
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merge reported by: Martin Pool
Merged at revision: not available
Proposed branch: lp://staging/~mbp/bzr/doc-old
Merge into: lp://staging/~bzr/bzr/trunk-old
Diff against target: 157 lines
To merge this branch: bzr merge lp://staging/~mbp/bzr/doc-old
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+7429@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

rms asked that our release mails mention that bzr is a GNU project.

Revision history for this message
Jonathan Lange (jml) wrote :

Fair enough. I don't think this needs to go into 1.16, but it'd be nice to land on trunk as soon as possible.

<jml> poolie: what happened to the '|' line prefix?
<poolie> i removed it so you can more easily copy the text
<jml> poolie: it wasn't necessary for formatting then?
<poolie> i think it changes it from the equivalent of <blockquote> to <pre>

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'doc/developers/bug-handling.txt'
2--- doc/developers/bug-handling.txt 1970-01-01 00:00:00 +0000
3+++ doc/developers/bug-handling.txt 2009-06-15 07:35:11 +0000
4@@ -0,0 +1,17 @@
5+=======================
6+Tracking Bugs in Bazaar
7+=======================
8+
9+This document describes the bug-tracking processes for developing Bazaar
10+itself.
11+
12+See also:
13+
14+* `Bazaar Developer Documents <index.html>`_.
15+
16+* `The Bazaar Development Cycle <cycle.html>`_.
17+
18+* `The Bazaar User Guide <../en/user-guide/index.html>`_ -- for
19+ information on integrating Bazaar with other bug trackers.
20+
21+.. vim: ft=rst
22
23=== modified file 'doc/developers/cycle.txt'
24--- doc/developers/cycle.txt 2008-10-17 08:05:03 +0000
25+++ doc/developers/cycle.txt 2009-06-15 07:35:11 +0000
26@@ -1,9 +1,32 @@
27+============================
28 The Bazaar Development Cycle
29 ============================
30
31
32-
33-General process
34+Overview
35+--------
36+
37+Bazaar makes a release every four weeks, with one release candidate one
38+week before the final release. We may vary this schedule from time to
39+time, amongst other things to respond to bugs reported in the release
40+candidate or the final release. Nevertheless, we value a regular release
41+and we will normally slip only for serious bugs or regressions.
42+
43+See also:
44+
45+* `Bazaar Developer Document Catalog <index.html>`_
46+
47+* `Releasing Bazaar <releasing.html>`_ -- the process for actually making
48+ a release or release candidate.
49+
50+Longer-Term Planning
51+--------------------
52+
53+Work spanning multiple releases is typically tracked in the bug tracker,
54+and summarized in <http://bazaar-vcs.org/Roadmap>.
55+
56+
57+General Process
58 ---------------
59
60 We normally have one person acting as the release manager, who
61@@ -93,13 +116,6 @@
62 <releasing.html>`_ as the first RC.
63
64
65-See also
66---------
67-
68-* `Bazaar Developer Document Catalog <index.html>`_
69-
70-* `Releasing Bazaar <releasing.html>`_ -- the process for actually making
71- a release or release candidate.
72
73
74 ..
75
76=== modified file 'doc/developers/index.txt'
77--- doc/developers/index.txt 2009-04-03 01:34:58 +0000
78+++ doc/developers/index.txt 2009-06-15 07:35:11 +0000
79@@ -49,6 +49,9 @@
80 * `EC2 resources <ec2.html>`_ |--| A team resource for
81 Windows packaging and testing, and Ubuntu testing.
82
83+* `Tracking Bugs in Bazaar <bug-handling.html>`_ |--| How we use the bug
84+ tracker.
85+
86 Plans
87 =====
88
89
90=== modified file 'doc/developers/releasing.txt'
91--- doc/developers/releasing.txt 2009-03-25 16:44:45 +0000
92+++ doc/developers/releasing.txt 2009-06-15 07:35:11 +0000
93@@ -158,23 +158,27 @@
94 ``Reply-To: bazaar@lists.canonical.com``, so that people who reply to
95 the announcement don't spam other lists.
96
97- The announce mail will look something like this:
98+ The announce mail will look something like this::
99
100- | Subject: bzr x.yy released!
101- |
102- | <<Summary paragraph from news>>
103- |
104- | The Bazaar team is happy to announce availability of a new
105- | release of the bzr adaptive version control system.
106- |
107- | Thanks to everyone who contributed patches, suggestions, and
108- | feedback.
109- |
110- | Bazaar is now available for download from
111- | http://bazaar-vcs.org/Download as a source tarball; packages
112- | for various systems will be available soon.
113- |
114- | <<NEWS section from this release back to the last major release>>
115+ Subject: bzr x.yy released!
116+
117+ <<Summary paragraph from news>>
118+
119+ The Bazaar team is happy to announce availability of a new
120+ release of the bzr adaptive version control system.
121+ Bazaar is part of the GNU project to develop a complete
122+ free software system.
123+
124+ Thanks to everyone who contributed patches, suggestions, and
125+ feedback.
126+
127+ Bazaar is now available for download from
128+ http://bazaar-vcs.org/Download as a source tarball; packages
129+ for various systems will be available soon.
130+
131+ <<NEWS section from this release back to the last major release>>
132+
133+ Feel free to tweak this to your taste.
134
135 #. Make an announcement through <https://launchpad.net/bzr/+announce>
136
137
138=== modified file 'doc/en/developer-guide/HACKING.txt'
139--- doc/en/developer-guide/HACKING.txt 2009-06-10 05:00:47 +0000
140+++ doc/en/developer-guide/HACKING.txt 2009-06-15 07:35:11 +0000
141@@ -1558,16 +1558,6 @@
142 Planning Releases
143 =================
144
145-Roadmaps
146---------
147-
148-As the two senior developers, Martin Pool and Robert Collins coordinate
149-the overall Bazaar product development roadmap. Core developers provide
150-input and review into this, particularly during sprints. It's totally
151-expected that community members ought to be working on things that
152-interest them the most. The roadmap is valuable though because it provides
153-context for understanding where the product is going as a whole and why.
154-
155
156 Using Releases and Milestones in Launchpad
157 ------------------------------------------