On Tue, Aug 5, 2008 at 6:56 PM, Alan Conway <[EMAIL PROTECTED]> wrote:
> I'm doing small incremental merges. The new functionality does nothing > unless explicitly enabled so it doesn't interfere with non-cluster use > of the broker. I prefer incremental merges to trunk (or some shared > post-M3 branch) so that my code gets continuously integrated with any > other work that is going on. If it doesn't affect stablity, it isn't really affected by the freeze, you can quite happily keep doing this. :) >> If you have to commit your stuff in the weeks between freeze and >> release then yeah, that makes sense. > > The other advantage of an M3 branch over a frozen trunk is that it's > unlikely anyone will accidentally commit post-M3 changes to an explicit > M3 branch, which is always a risk with the trunk. I'm not overly worried about this, it's easy enough to catch during code review and revert it, in the unlikely (I hope) event that it happens and much less work than trying to maintain branches. - Aidan -- Apache Qpid - World Domination through Advanced Message Queueing http://cwiki.apache.org/qpid "Nine-tenths of wisdom consists in being wise in time." - Theodore Roosevelt
