On Dec 18, 2007 12:07 PM, Robert Godfrey <[EMAIL PROTECTED]> wrote: > > > PS: those are the two remaining issues to be fixed before we can safely > > > start M2/trunk merging. > > > > Hurrah! I'll try to get some time tomorrow to get started on that > > process, I'll send patches for the two tests when I've dug them out of > > qpid-commits. > > > > Given all the work on M2.1 I would really prefer to merge from M2.1 to > trunk than from M2 to trunk... otherwise we'll only have to do a > second big merge :-(
Well, what's currently M2.1 is misnamed. We should merge from M2.1 to M2, rename that branch to something else and cut a new M2.1 which includes the multiversion protocol support. We should then merge from that. - Aidan -- aim/y!:aidans42 g:[EMAIL PROTECTED] http://aidan.skinner.me.uk/ "When the going gets weird, the weird turn pro." -- Hunter S. Thompson
