I think I'd prefer us to say that we'll hold off the merge until next week so that we can actually get approval for an M2 branch.
I don't think any work should be getting held up... We have two parrallel streams, the fact that currently one is "trunk" and the other is "0-9", and we want to move to the situation where one is "M2" and the other is "trunk" doesn't fundamentally change the dynamics of the problem (we could have two streams called apple and banana and the problems would be the same - and it would probably be less contentious :-) ). As I understand it right now, most to all work on the Java side is being done on "trunk", most to all work on the C++ side is being done on "0-9". Therefore whenever we time the branching/merging there shouldn't be a lot of conflicts. What we want to avoid is merging / branching while people still have a significant amount of work checked out. We should allow people a few days grace to complete the work they are currently undertaking, and then a few more days to test it :-) But as of now, other than bug-fixes, I don't think we should be doing any new work on trunk. Thoughts? Rob On 07/03/07, Alan Conway <[EMAIL PROTECTED]> wrote:
Martin Ritchie wrote: > From Marnie >> We have quite a bit of work to consider/do prior to release including >> interop testing, docs etc. Happy to raise JIRAs (or assist the release >> manager) for an M2 set of tasks if we proceed. > > From Alan >> ll be merging the 0-9 C++ branch (Jira QPID-400) soon, speak up if you >> ow of any outstanding issues. The plan is to merge python first for >> the tests (branch python speaks both old & new protocols) then the C++ >> codebase. > > I'm concerned about the timing of these events. Simple solution to this: we make the M2 branch now. The trunk is the place for forward development, if a pending release is holding back forward development that is the sign that we need a release branch. That will allow all the 0-9 work to come back to the trunk with no risk to M2. Work that should be on both will have to be merged across, there's no way around that but it doesn't make sense to hold up trunk development for M2 anymore. Cheers, Alan.
