And I'd just like to appologise for not doing my merges in a reasonable time frame after doing the work on M2. It seems like I keep doing one bug fix after another .. with the inevitable feature creep that I never made it to merging. A big thanks to Rupert for taking this on.
-- Martin On 19/04/07, Robert Godfrey <[EMAIL PROTECTED]> wrote:
On 19/04/07, Alan Conway <[EMAIL PROTECTED]> wrote: > > On Thu, 2007-04-19 at 08:30 +0100, Robert Godfrey wrote: > > The plan is to get M2 to a releasable point, and for it to be the final, > > stable, version of Qpid that uses the 0-8 version of the > protocol. Fixes we > > add to M2 will be merged down on to trunk. > > Not sure if that was a typo but in my experience if you need to apply a > fix to M2 and the trunk you fix M2 *first* and then merge to the trunk. That was certainly what I meant... My words may not have been in the right order,,,, Reason being the trunk should (in principle) include every fix in M2, > but M2 should NOT contain most of the work on trunk. Merging from trunk > to M2 carries a high risk of bringing unintended changes along with the > fix you meant to apply. Yep. -- Rob
