1 should not be done (trunk -> branch is the way imho otherwise i'm sure well miss features on trunk which is worse than the.opposite)
About "merge what we can" we need a thread on it i guess. Perso i dont do it for new features even when doable cause 1) time, 2) trunk already diverged from branch on some important aspects (scanning, ill try to merge this one soon cause it fixes 2 important bugs), 3) 1.x is in maintenance so for me it means fixes but no more features -> to discuss also in the same thread. Le 19 août 2014 08:59, "Andy Gumbrecht" <[email protected]> a écrit : > Hi Devs, > > As we are not dropping the ball on TomEE 1.7.x just yet it is still > important to maintain the code base here: > > https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-1.7.x > > The buildbot is configured for this repository here: > > http://ci.apache.org/builders/tomee-1.7.x-ubuntu > > To that end, please don't forget to either: > > 1. Fix and test the code in the 1.7.x branch first and merge to trunk > > 2. Fix the code in trunk and back-port what is applicable to 1.7.x > > This also means creating JIRA's for 1.7.1 - The 1.7.x branch will not be > getting any new features, so this only applies to issues. > > Thanks everyone, > > Andy. > > -- > Andy Gumbrecht > > http://www.tomitribe.com > [email protected] > https://twitter.com/AndyGeeDe > > TomEE treibt Tomitribe! | http://tomee.apache.org > >
