[Building Sakai] Neoportal work

[Aaron Zeckoski]

Like Matt says, please don't merge things into the .x branches unless
you are the branch manager and generally, things should not be merged
back into branches until after QA has checked it.

-AZ


On Tue, May 22, 2012 at 9:48 AM, Matthew Jones <matthew at longsight.com> wrote:
> Normally the release team would do the merge after all of the work
> is verified complete for any core tools according to the workflow.
> https://confluence.sakaiproject.org/display/MGT/Sakai+Jira+Guidelines
>
> A developer commits all of their work in trunk and a QA (or a developer)
> verifies it. Then the the flag on the ticket is set to merge for
> 2.9.x/2.8.x/etc if applicable. Before the next release is cut, someone on
> the release team merges all flagged tickets into the next branch. Some
> special cases apply, like if there's conflicts it might be tossed back to
> the developer or marked as "Won't Fix" and all features (non-bugs) have to
> go through feature approval process and meet criteria [1], otherwise they
> have to wait for the next release.
>
> Typically only on indies that have their own teams (samigo, lesson builder)
> and contrib projects do their own merging. Most core merges are done by the
> release team manually.
>
> [1] https://confluence.sakaiproject.org/display/TCC/Maintenance+Branch+Merge+Policy
>
> On Tue, May 22, 2012 at 9:38 AM, Adrian Fish <a.fish at lancaster.ac.uk> wrote:
>>
>> Hi Chuck (or anybody),
>>
>> Just a quickie ...
>>
>> I'm working on the neoportal tab stuff (SAK-22026) in the trunk and intend
>> to merge later, when it's all shipshape. Is that a good way to go about it?
>> I was merging every commit into 2.9.x as I went but it was a bit of a pain.
>> Does any of the trunk stuff get merged back into 2.9.x when new 2.9 betas
>> get cut?
>>
>> Cheers,
>> Adrian.
>>
>> --
>> ==================================
>> Adrian Fish
>> Software Engineer
>> B66 Management School
>> Lancaster University
>> Lancaster
>> LA1 4YW
>>
>> http://www.sakaiproject.org
>> http://confluence.sakaiproject.org/display/YAFT/Yaft
>> http://confluence.sakaiproject.org/display/CLOG/Home
>> http://confluence.sakaiproject.org/display/BBB/Home
>>
>>
>> _______________________________________________
>> sakai-dev mailing list
>> sakai-dev at collab.sakaiproject.org
>> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>>
>> TO UNSUBSCRIBE: send email to
>> sakai-dev-unsubscribe at collab.sakaiproject.org with a subject of
>> "unsubscribe"
>
>
>
> _______________________________________________
> sakai-dev mailing list
> sakai-dev at collab.sakaiproject.org
> http://collab.sakaiproject.org/mailman/listinfo/sakai-dev
>
> TO UNSUBSCRIBE: send email to sakai-dev-unsubscribe at collab.sakaiproject.org
> with a subject of "unsubscribe"



-- 
Aaron Zeckoski - Software Architect - http://tinyurl.com/azprofile