merge/review process

[Michael Ellerman]

On Thu, 8 Dec 2005 20:10, Robert Collins wrote:
> On Fri, 2005-12-09 at 12:56 +1100, Martin Pool wrote:
> > OK, sounds good.  So anything that wants to be reviewed for merge should
> > say [patch] - and preferably contain a diff even if you want me/us to
> > merge from a branch.
>
> I meant other way around ;)
>
> [merge] = 'please review this for merge'
> [patch] = 'there is code in here, draft or whatever, but not ready for
> merge review'

Or because there's _always_ another way to do everything .. :)

[PATCH]
This is a patch, I want people to review it and apply it, I might also include 
a branch URL in which case it can be merged using bzr.

[MERGE]
This is a description of a change, bzr log --short, with a pointer to a branch 
that I want you to merge.

[RFC PATCH]
patch I want you to look at and comment on, but it's not ready to apply yet.

[RFC MERGE]
No points for guessing.

cheers                

-- 
Michael Ellerman
IBM OzLabs

email: michael:ellerman.id.au
inmsg: mpe:jabber.org
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051208/e45bc1ba/attachment.pgp