+1 for C Note this blog post http://lsimons.wordpress.com/2010/02/19/using-long-lived-stable-branches/ which is recommended by http://incubator.apache.org/guides/releasemanagement.html#best-practice The post advocates having a single stable branch (used as the basis for all releases).
A very short version, missing details, is: commits go to trunk and are merged into the stable branch if needed to be put into the release. Something for us to consider not just for future releases but also when naming the branch that is created (do we just call it stable as the post suggests?) -- James > -----Original Message----- > From: [email protected] > [mailto:ctakes-dev-return-860- > [email protected]] On Behalf Of Wu, Stephen T., > Ph.D. > Sent: Thursday, November 15, 2012 10:19 AM > To: [email protected] > Subject: Re: trunk still frozen? > > +1 for C > > stephen > > > On 11/15/12 10:12 AM, "Coarr, Matt" <[email protected]> wrote: > > > I vote for C. I also have some code changes that are in need of a > > commit to make it easier to collaborate. > > > > Matt > > > > > > On 2012-11-15 11:05 , "Steven Bethard" <[email protected]> > wrote: > > > >> On Nov 14, 2012, at 2:28 PM, Steven Bethard > >> <[email protected]> > >> wrote: > >>> What's the status of the cTAKES trunk? Is it still frozen for the > >>> pending release? > >> > >> On Nov 14, 2012, at 7:13 PM, "Chen, Pei" > >> <[email protected]> > >> wrote: > >>> It's been getting ready for the 3.0 release > >> > >> Ok, we're currently working on a paper based on the > >> relation-extractor work, and we need to make some modifications to > >> that code. Trading diffs over email isn't really a practical option. > >> > >> So should we: > >> > >> (a) work directly in trunk, and just let the release include our > changes? > >> (b) create a branch for the relation extractor, and merge it back > >> into trunk after the release? > >> (c) create a branch for the release? > >> > >> Steve > >> > >
