Commiting to stable and head, easily

[Adam Jackson]

[Replying on-list, this is generally useful info]

On Monday 03 April 2006 14:57, Deron Johnson wrote:
> Do I need to do anything special to make sure that the changes I made to
> CVS head last week wind up in the stable branch. I'm a little bit fuzzy
> on the release plan at this point. Is there a document I can refer to,
> or can you clarify what is the source base strategy from now until the
> release?

You haven't committed anything since the stable branch was created, which 
means your changes are in.

At this point only the server has a stabilization branch, none of the others 
have needed one.  So:

Outside the server:
- If it's a bug fix, just commit
- If it's a feature add, make a stable branch, commit to HEAD, and announce 
the branch's creation on list
- If you're unsure, ask the list, or make a bug and set it to block #5041

Inside the server, or any module that has been branched via above procedure:
- If it's a bug fix, commit to both HEAD and the stable branch
- If it's a feature add, commit to HEAD only
- If you're unsure, ask the list, or make a bug and set it to block #5041

Starting April 17 (halfway between RC1 and RC2), the rules change to:
- If it's a bug fix, commit to HEAD, and create a blocker bug for #5041
- If it's a feature add, commit to HEAD, branching if necessary as above
- If you're unsure, ask the list, or make a bug and set it to block #5041

I think I said April 21 in my last message, but that feels a bit late, so I 
moved it back a bit.  I don't expect to modify the schedule much beyond that 
though.  Remember that the release is May 19, which is just over six weeks 
from now, so please do update to the 1.1 branch and test things.

- ajax
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20060403/b1677a51/attachment.pgp>