Hi Bill, Yep - subversion makes it very easy to merge the branches. However it does not talk about conflicts ! So merging is easy if there are no conflicts.
Also the authors must make sure they commit and apply the changes to the trunk (with the consent of the release manager of course) at the same time - a bit of a burden to the authors when the numbers are high. SO We'll let the RM (Thilina) decide when to cut the branch. My personal feeling is you guys can keep on working in the trunk and the RM will cut a branch after the code freeze so that the trunk folks can move on without any hassel. Code freeze means the code is fairly stable so whatever the changes that happens to the branch will be minimal. Anyway its Thilina's call :) On 9/15/06, Bill Nagy <[EMAIL PROTECTED]> wrote:
Hi all, There's actually a good description of the why and how's of creating a release branch in the Subversion book (http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.commonuses.patterns.release) I don't understand why folks are saying that figuring out what goes where is tricky or that the work is that difficult. I agree with dims that the RM should be in charge of creating the branch for the release -- that branch is then the RM's responsibility. The RM gets to decide which bug fixes (or features I suppose) get added to the branch after it is made. The RM, however, has no more of a vote than anyone else as to what gets placed into the trunk. Bug fixes that are made to the release branch should most likely be committed to the trunk as well, but the RM doesn't have to be the one that does it. (If another committer made the change to the release branch, then they should probably also commit the change to the trunk.) Moving changes between branches with subversion is relatively trivial, and, unless the release drags on, I can't imagine that the code bases will diverge that much. -Bill On Fri, 2006-09-15 at 10:45 -0400, Rajith Attapattu wrote: > I am also worried about the concerns raised by Ajith and then Eran. > Especially the decision around when to create the branch and what > fixes should be propagated to the trunk are going to be a bit tricky. > > I also agree that the workload for the RM is going to be increased > substantially. > > How about if we free the RM of his other duties (bug fixes ..etc) and > get him to do RM on a full-time basis during the release cycle? > We need a person to fully manage the release process, especially make > the important decisions of which fixes are propagated to trunk ..etc > without being burdened by other tasks. > > Regards, > > Rajith > > On 9/15/06, Brent Ulbricht <[EMAIL PROTECTED]> wrote: > > +1 for a branch > > I agree that the branch would be best created when new > function cannot be committed to head. > > Brent Ulbricht > IBM Software Group - WebSphere FVT > [EMAIL PROTECTED] > > > > > > Jeff Barrett/Austin/[EMAIL PROTECTED] > > 09/15/2006 07:49 AM > > Please respond to > axis-dev@ws.apache.org > > > To > axis-dev@ws.apache.org > cc > > > Subject > Re: > [Axis2][Vote] > Create a branch > for the Axis2 > 1.1 release > > > > > > > > > > > > +1 to creating the branch. > > As to the timing of the creating the branch, It seems it needs > to be created at the point when we are asked to stop > committing new function to HEAD, i.e. "code freeze". > > Thanks, > Jeff > > IBM Software Group - WebSphere Web Services Development > Phone: 512-838-4587 or Tie Line 678-4587 > Internet e-mail and Sametime ID: [EMAIL PROTECTED] > > Nicholas L > Gallardo/Austin/[EMAIL PROTECTED] > > 09/14/2006 04:18 PM > Please respond to > axis-dev@ws.apache.org > > To > axis-dev@ws.apache.org > cc > > > Subject > Re: > [Axis2][Vote] > Create a branch > for the Axis2 > 1.1 release > > > > > > > > > > > > > > Ajith, > > Branching before would allow others to continue longer term > development items while the final fixes are being applied to > the upcoming release. > > Regards, > > Nicholas Gallardo > WebSphere - WebServices Development > [EMAIL PROTECTED] > Phone: 512-838-1182 > Building: 901 / 5G-016 > "Ajith Ranabahu" > <[EMAIL PROTECTED]> > > 09/14/2006 04:11 PM > Please respond to > axis-dev@ws.apache.org > > > > > > To > axis-dev@ws.apache.org > cc > > > Subject > Re: > [Axis2][Vote] > Create a branch > for the Axis2 > 1.1 release > > > > > > > > > > > > > > > Hi guys, > If I understand right the branching usually happens at the > same time of a release (or slightly after) and is usually > used to fix issues in that particular release. We can > definitely use a branch before the release but is there any > particular reason why we need a branch before the release ? > > > -- > Ajith Ranabahu > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
-- Ajith Ranabahu --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
