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

Proposed by Martin Pool on 2009-05-05
Status: Merged
Approved by: John A Meinel on 2009-05-05
Approved revision: no longer in the revision history of the source branch.
Merged at revision: not available
Proposed branch: lp:~mbp/bzr/doc-old
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 182 lines
To merge this branch: bzr merge lp:~mbp/bzr/doc-old
Reviewer Review Type Date Requested Status
John A Meinel Needs Fixing on 2009-05-05
Vincent Ladeuil 2009-05-05 Needs Fixing on 2009-05-05
Review via email: mp+6199@code.launchpad.net
To post a comment you must log in.
Martin Pool (mbp) wrote :

This updates the bzr developer guide to primarily recommend that people propose changes to bzr through Launchpad merge proposals.

This also fixes the historical artefact that the developer guide was stored in doc/developers/HACKING but built to doc/en/developer-guide/.

Vincent Ladeuil (vila) wrote :

>>>>> martin wrote:

> === renamed file 'doc/developers/HACKING.txt' => 'doc/en/developer-guide/HACKING.txt'
> --- doc/developers/HACKING.txt 2009-03-28 10:10:14 +0000
> +++ doc/en/developer-guide/HACKING.txt 2009-05-05 07:17:43 +0000

> @@ -332,9 +303,102 @@
> * (your ideas here...)

> -Bundle Buggy and review outcomes
> -================================
> -
> +Reviews on Launchpad
> +====================
> +
> +From May 2009 on, we prefer people to propose code reviews through
> +Launchpad.
> +
> + * <https://launchpad.net/+tour/code-review>
> +
> + * <https://help.launchpad.net/Code/Review>
> +
> +Anyone can propose or comment on a merge propsal just by creating a
> +Launchpad account.

s/propsal/proposal/

BB:tweak ? (how do we do that by mail now ?)

review: Needs Fixing
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
> Review: Needs Fixing
>>>>>> martin wrote:
>
>> === renamed file 'doc/developers/HACKING.txt' => 'doc/en/developer-guide/HACKING.txt'
>> --- doc/developers/HACKING.txt 2009-03-28 10:10:14 +0000
>> +++ doc/en/developer-guide/HACKING.txt 2009-05-05 07:17:43 +0000
>
>> @@ -332,9 +303,102 @@
>> * (your ideas here...)
>
>
>> -Bundle Buggy and review outcomes
>> -================================
>> -
>> +Reviews on Launchpad
>> +====================
>> +
>> +From May 2009 on, we prefer people to propose code reviews through
>> +Launchpad.
>> +
>> + * <https://launchpad.net/+tour/code-review>
>> +
>> + * <https://help.launchpad.net/Code/Review>
>> +
>> +Anyone can propose or comment on a merge propsal just by creating a
>> +Launchpad account.
>
> s/propsal/proposal/
>
> BB:tweak ? (how do we do that by mail now ?)
>

https://help.launchpad.net/Code/Review

 review needs-fixing
 status approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoAPPkACgkQJdeBCYSNAAMWcwCff8b2Qn8aAgZRV1xgw6hwI3q0
Z2EAoMPhlw3nx7utufPSZiVBhdg80JOK
=Y/ct
-----END PGP SIGNATURE-----

review: Needs Fixing
lp:~mbp/bzr/doc-old updated on 2009-05-11
4327. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-05

(vila) Make --coverage works for threads too

4328. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-05

(Jelmer) Add Tags.rename_revisions().

4329. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-05

(Samuel Bronson) Suggest 'bzr missing' in DivergedBranches.

4330. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-05

(Jelmer) Make sure class member local_repository of reconfigure is
 initialized.

4331. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-05

(Jelmer) Add InterBranch.push.

4332. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-05

(vila) Parametrize tests against dir readers and fix some unicode
 symlink latent bugs

4333. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

(robertc) Calculate new rich root parent data with logic consistent
 with reconcile. (Robert Collins)

4334. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

Make it easier to blackbox test rules (Marius Kruger)

4335. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

(igc) Raise an error for unknown eol values. (Brian de Alwis)

4336. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

(igc) pull --local (Gary van der Merwe)

4337. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

testing pqm unicode support

4338. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

Revert previous patch,
 PQM now presents a unicode friendly file system encoding

4339. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

(igc) reconfigure --standalone no longer raises
 IncompatibleRepositories (Martin von Gagern)

4340. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-06

(Jelmer) Add InterBranch.pull.

4341. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-07

(Jelmer) Mention --force in the error message when unable to access
 in the master branch in 'bzr switch'.

4342. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-07

(robertc) Do not trigger NoSuchRevision pulling from a stacked branch
 when the client needs content from it and the stacked-on
 branch. (Robert Collins)

4343. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-07

(Johan Walles) fix bug #180116 by using a sort() and linear operation
 for osutils.minimum_path_selection()

4344. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-08

(vila) Some cleanup in log tests

4345. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-08

(jam) Better error when looking for TortoiseOverlays.

4346. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-08

(jam)(trivial) Fix an important doc bug about the api of
 iter_all_entries()

4347. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-08

(vila) Fix some lock-related test failures

4348. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-11

(mbp) move HACKING and recommend Launchpad reviews

4349. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-11

(jml) Show number of VFS calls when using -Dhpss.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-03-25 18:48:15 +0000
3+++ Makefile 2009-05-08 23:35:31 +0000
4@@ -84,12 +84,12 @@
5 # translate txt docs to html
6 derived_txt_files := \
7 doc/en/user-reference/bzr_man.txt \
8- doc/en/developer-guide/HACKING.txt \
9 doc/en/release-notes/NEWS.txt
10 txt_files := $(wildcard doc/en/tutorials/*.txt) \
11 $(derived_txt_files) \
12 doc/en/user-guide/index.txt \
13 doc/en/mini-tutorial/index.txt \
14+ doc/en/developer-guide/HACKING.txt \
15 $(wildcard doc/es/guia-usario/*.txt) \
16 doc/es/mini-tutorial/index.txt \
17 doc/index.txt \
18@@ -181,9 +181,6 @@
19 doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
20 $(PYTHON) generate_docs.py -o $@ rstx
21
22-doc/en/developer-guide/HACKING.txt: doc/developers/HACKING.txt
23- $(PYTHON) tools/win32/ostools.py copytodir doc/developers/HACKING.txt doc/en/developer-guide
24-
25 doc/en/release-notes/NEWS.txt: NEWS
26 $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
27
28
29=== renamed file 'doc/developers/HACKING.txt' => 'doc/en/developer-guide/HACKING.txt'
30--- doc/developers/HACKING.txt 2009-03-28 10:10:14 +0000
31+++ doc/en/developer-guide/HACKING.txt 2009-05-08 23:35:31 +0000
32@@ -12,7 +12,7 @@
33 document, send a merge request or new text to the mailing list.
34
35 The current version of this document is available in the file
36-``doc/developers/HACKING.txt`` in the source tree, or at
37+``doc/en/developer-guide/HACKING.txt`` in the source tree, or at
38 http://doc.bazaar-vcs.org/bzr.dev/en/developer-guide/HACKING.html
39
40 See also:
41@@ -209,35 +209,6 @@
42
43
44
45-Sending patches for review
46-==========================
47-
48-If you'd like to propose a change, please post to the
49-bazaar@lists.canonical.com list with a bundle, patch, or link to a
50-branch. Put ``[PATCH]`` or ``[MERGE]`` in the subject so Bundle Buggy
51-can pick it out, and explain the change in the email message text.
52-Remember to update the NEWS file as part of your change if it makes any
53-changes visible to users or plugin developers. Please include a diff
54-against mainline if you're giving a link to a branch.
55-
56-You can generate a merge request like this::
57-
58- bzr send -o bug-1234.patch
59-
60-A ``.patch`` extension is recommended instead of .bundle as many mail clients
61-will send the latter as a binary file.
62-
63-``bzr send`` can also send mail directly if you prefer; see the help.
64-
65-Please do **NOT** put [PATCH] or [MERGE] in the subject line if you don't
66-want it to be merged. If you want comments from developers rather than
67-to be merged, you can put ``[RFC]`` in the subject line.
68-
69-If this change addresses a bug, please put the bug number in the subject
70-line too, in the form ``[#1]`` so that Bundle Buggy can recognize it.
71-
72-If the change is intended for a particular release mark that in the
73-subject too, e.g. ``[1.6]``.
74
75
76 Review cover letters
77@@ -332,9 +303,102 @@
78 * (your ideas here...)
79
80
81-Bundle Buggy and review outcomes
82-================================
83-
84+Reviews on Launchpad
85+====================
86+
87+From May 2009 on, we prefer people to propose code reviews through
88+Launchpad.
89+
90+ * <https://launchpad.net/+tour/code-review>
91+
92+ * <https://help.launchpad.net/Code/Review>
93+
94+Anyone can propose or comment on a merge propsal just by creating a
95+Launchpad account.
96+
97+There are two ways to create a new merge proposal: through the web
98+interface or by email.
99+
100+
101+Proposing a merge through the web
102+---------------------------------
103+
104+To create the propsal through the web: push your branch to Launchpad, eg::
105+
106+ bzr push lp:~mbp/bzr/doc
107+
108+then go to the branch's web page, which in this case would be
109+<https://code.launchpad.net/~mbp/bzr/doc>. You can automate that by just
110+running ::
111+
112+ bzr lp-open
113+
114+You can then click "Propose for merging into another branch", and enter a
115+cover letter into the web form. Typically you'll want to merge into
116+``~bzr/bzr/trunk`` which will be the default; you might also want to
117+nominate merging into a release branch for a bug fix. There is the option
118+to specify a specific reviewer or type of review, and you shouldn't
119+normally change those.
120+
121+Submitting the form takes you to the new page about the merge proposal
122+containing the diff of the changes, comments by interested people, and
123+controls to comment or vote on the change.
124+
125+Proposing a merge by mail
126+-------------------------
127+
128+To propose a merge by mail, send a bundle to ``merge@code.launchpad.net``.
129+
130+You can generate a merge request like this::
131+
132+ bzr send -o bug-1234.diff
133+
134+``bzr send`` can also send mail directly if you prefer; see the help.
135+
136+Reviewing changes
137+-----------------
138+
139+From <https://code.launchpad.net/bzr/+activereviews> you can see all
140+currently active reviews, and choose one to comment on. This page also
141+shows proposals that are now approved and should be merged by someone with
142+PQM access.
143+
144+
145+Reviews through Bundle Buggy
146+============================
147+
148+The Bundle Buggy tool used up to May 2009 is still available as a review
149+mechanism.
150+
151+Sending patches for review
152+--------------------------
153+
154+If you'd like to propose a change, please post to the
155+bazaar@lists.canonical.com list with a bundle, patch, or link to a
156+branch. Put ``[PATCH]`` or ``[MERGE]`` in the subject so Bundle Buggy
157+can pick it out, and explain the change in the email message text.
158+Remember to update the NEWS file as part of your change if it makes any
159+changes visible to users or plugin developers. Please include a diff
160+against mainline if you're giving a link to a branch.
161+
162+You can generate a merge request like this::
163+
164+ bzr send -o bug-1234.patch
165+
166+A ``.patch`` extension is recommended instead of .bundle as many mail clients
167+will send the latter as a binary file.
168+
169+``bzr send`` can also send mail directly if you prefer; see the help.
170+
171+Please do **NOT** put [PATCH] or [MERGE] in the subject line if you don't
172+want it to be merged. If you want comments from developers rather than
173+to be merged, you can put ``[RFC]`` in the subject line.
174+
175+If this change addresses a bug, please put the bug number in the subject
176+line too, in the form ``[#1]`` so that Bundle Buggy can recognize it.
177+
178+If the change is intended for a particular release mark that in the
179+subject too, e.g. ``[1.6]``.
180 Anyone can "vote" on the mailing list by expressing an opinion. Core
181 developers can also vote using Bundle Buggy. Here are the voting codes and
182 their explanations.