On May 4, 2011, at 6:31 AM, Owen O'Malley wrote: > > On May 3, 2011, at 9:35 AM, Eli Collins wrote: > >> Do all changes for 0.20.2xx release go through branch-0.20-security, >> then get merged to a particular -2xx branch? > > I've discussed this before on the lists, but here goes: > > branch-0.20-security is the major branch and all changes need to be committed > to it. >
how do we get these things back onto the trunk. I think it's fine to do a release off a branch this time, but eventually all these stuff needs to go back into trunk. > > -- Owen