Re: Merging to the 1.8.x branch

On 03/16/2012 04:48 PM, Bruce Atherton wrote: If there are bug fixes that need to go into a future 1.8.4 release we can deal with them when the time comes. Agreed, i.e. option 2. Rather than sifting through all commits made into trunk - which besides Java 5 could include all sorts of code clea

Re: Merging to the 1.8.x branch

I agree. Option 2 is the better choice. Changesets on trunk can be Java5 specific. It would be problematic to have to also include tested Java 1.4 versions on a 1.8 branch that may never see the light of day. If there are bug fixes that need to go into a future 1.8.4 release we can deal with t

Re: Merging to the 1.8.x branch

On Thu, Mar 15, 2012 at 11:58 PM, Stefan Bodewig wrote: > Hi, > > WRT merging to the branch we basically have two options: (1) merge when > we commit to trunk or (2) merge when we know we want to create another > 1.8.x release. > > I'm leaning towards (2) since I personally don't expect a 1.8.4 >

Merging to the 1.8.x branch

Hi, WRT merging to the branch we basically have two options: (1) merge when we commit to trunk or (2) merge when we know we want to create another 1.8.x release. I'm leaning towards (2) since I personally don't expect a 1.8.4 release. But just in case I've created a wiki page at