On Dec 18, 2007 12:56 PM, Rupert Smith <[EMAIL PROTECTED]> wrote: > ? M2 is a release branch for what went into M2. > > M2.1 is mis-named, its purpose is to act as 'main line' for work on the Java > 0.8 line. It would have been better if we had called it M2.x. > > Don't merge from the main line into the old release branch. That's for bug > fixes to be applied to that release.
Quite right, I was a .1 off on all those: M2.1.1 is misnamed, M2.1 should be M2.x and have things merged to it from M2.1.1, which is where I'll do the merge to trunk from. - Aidan (who will be very glad when this is all sane again). -- aim/y!:aidans42 g:[EMAIL PROTECTED] http://aidan.skinner.me.uk/ "When the going gets weird, the weird turn pro." -- Hunter S. Thompson
