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. 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. Cheers, Alan.
