Bazaar

Merge lp:~mbp/bzr/doc into lp:bzr

  1. doc
  2. Merge into bzr.dev
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mbp/bzr/doc
Merge into: lp:bzr
Diff against target: 30 lines (+15/-1)
1 file modified
doc/developers/cycle.txt (+15/-1)
To merge this branch: bzr merge lp:~mbp/bzr/doc
Reviewer Review Type Date Requested Status
John A Meinel Approve
Vincent Ladeuil Approve
Review via email: mp+16117@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

Just a couple of things we learned from the https://bugs.edge.launchpad.net/ubuntu/+source/bzr/+bug/437626 sru

Revision history for this message
Vincent Ladeuil (vila) wrote :

Please land.

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

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

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/doc into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #429151 'bzr help' in "getting help" section should be 'bzr help topics'
> https://bugs.launchpad.net/bugs/429151
>
>
> Just a couple of things we learned from the https://bugs.edge.launchpad.net/ubuntu/+source/bzr/+bug/437626 sru
>

I don't see how this is related to bug #429151, but the content seems fine.

 review: approve
 merge: approve

John
=:->

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

iEYEARECAAYFAksoFCMACgkQJdeBCYSNAAOL0gCeJwBzaL3rODFNgHN8yskwnhF7
Bx0AnjMJSHcad+WUfmCVqnq8H615ImAp
=1XS6
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Martin Pool (mbp) wrote :

2009/12/16 John A Meinel <email address hidden>:
> I don't see how this is related to bug #429151, but the content seems fine.

It's not, that was previously fixed on this branch, but not updated.
See https://bugs.edge.launchpad.net/launchpad-code/+bug/494807 for
them being spuriously in the mp mail.

--
Martin <http://launchpad.net/~mbp/>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/developers/cycle.txt'
2--- doc/developers/cycle.txt 2009-12-02 20:34:07 +0000
3+++ doc/developers/cycle.txt 2009-12-14 08:43:28 +0000
4@@ -421,6 +421,21 @@
5
6 * Users like it.
7
8+
9+Reviewing for the Stable Branch
10+*******************************
11+
12+* All changes to the stable branch should fix a bug, even if you would not
13+ normally file a bug for the change. The bug description should if at
14+ all possible explain how to manually verify the bug in a way that will
15+ fail before and pass after the change. (These are requirements for the
16+ SRU process.)
17+
18+* The change should be reasonably small and conservative. Be extra
19+ careful of things that could break on other platforms or locales.
20+
21+* (more items welcome)
22+
23 References
24 **********
25
26@@ -428,4 +443,3 @@
27
28 ..
29 vim: filetype=rst textwidth=74 ai shiftwidth=4
30-