[sakai2-tcc] Policy for merging in bug fixes to maintenance branches

[Kevin Chan]

Hi Matthew,

Thanks for the clarification - that is my understanding as well.

So let me go back to specifics:
https://jira.sakaiproject.org/browse/SAK-19778

2.7.x status and 2.8.x status are both set to "Merge". So who are the 
"someone" that knows to make the merges happen? Is there a list of 
developers for each maintenance branch? Should I ask for a merge on the 
sakai-dev list?

This is a one-line merge that has been verified in 2.7.1 and 2.8.0 b02 
since January 2011.

I will see about adding myself as a branch manager for 2.7.x. Are there 
any qualifications or duties (aka minimum time devoted to being a branch 
manager)? I am not strictly a Java developer and I do not anticipate 
having a lot of time to devote to this duty.

   Kevin Chan

   Operations Team
   Educational Technology Services
   UC Berkeley


On 6/20/11 12:13 PM, Matthew Jones wrote:
> For items that are clearly defined as bugs that affect previous 
> releases, they can be merged without discussion. Branch/release 
> managers typically will merge these into the appropriate branches that 
> are flagged on jira. If it is in a project that has a lead (like 
> Samigo, OSP, Assignments) then that lead will often do the merging. I 
> don't think this process has changed much from 2.5. [1]
>
> A developer, usually the assignee or someone who has merged the fix 
> locally into their production instance, will flag the 2.?.x status on 
> jira as "Merge" so someone knows to merge it. If this person doing the 
> merge has a conflict or another question, they might push it back for 
> clarification, but generally it works pretty smooth. When all merges 
> are done the issue can be closed.
>
> To volunteer yourself or one of your friends as a branch manager, you 
> can email arwhyte. ;)
>
> [1] 
> https://confluence.sakaiproject.org/display/REL/Sakai+2.x+branch+management+cheat+sheet
>
> On Mon, Jun 20, 2011 at 2:49 PM, Kevin Chan <kevin at media.berkeley.edu 
> <mailto:kevin at media.berkeley.edu>> wrote:
>
>     Thanks for the clarification.
>
>     I guess my next question is (since I jumped the gun with the wrong
>     process) what is the current process for merging in bug fixes to the
>     maintenance branches?
>
>       Kevin Chan
>
>       Operations Team
>       Educational Technology Services
>       UC Berkeley
>
>
>     On 6/16/11 2:18 PM, Beth Kirschner wrote:
>     > On Jun 15, 2011, at 6:14 PM, Kevin Chan wrote:
>     >> Is this email sufficient to satisfy the "public announcement"
>     requirement?
>     >>
>     > I would say it is -- but I wonder if this process applies to
>     this issue -- it's classified as a bug.
>     >
>     >> Can someone list the locations re: where the 2.7.x (for
>     example) release notes are that requires updating?
>     >>
>     > I would suggest updating the release notes section of the JIRA
>     (just select "edit").
>     >
>     > - Beth
>     >
>     >> Thanks,
>     >>
>     >> --
>     >>    Kevin Chan
>     >>
>     >>    Operations Team
>     >>    Educational Technology Services
>     >>    UC Berkeley
>     >>
>     >> _______________________________________________
>     >> production mailing list
>     >> production at collab.sakaiproject.org
>     <mailto:production at collab.sakaiproject.org>
>     >> http://collab.sakaiproject.org/mailman/listinfo/production
>     >>
>     >> TO UNSUBSCRIBE: send email to
>     production-unsubscribe at collab.sakaiproject.org
>     <mailto:production-unsubscribe at collab.sakaiproject.org> with a
>     subject of "unsubscribe"
>     _______________________________________________
>     sakai2-tcc mailing list
>     sakai2-tcc at collab.sakaiproject.org
>     <mailto:sakai2-tcc at collab.sakaiproject.org>
>     http://collab.sakaiproject.org/mailman/listinfo/sakai2-tcc
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai2-tcc/attachments/20110620/44c0fee5/attachment.html