qpid-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin Ritchie <ritch...@apache.org>
Subject Re: [0.5][README] Upcoming SVN surgery
Date Mon, 13 Apr 2009 10:45:53 GMT
2009/4/10 Aidan Skinner <aidan@apache.org>:
> This is a "watch your head, incoming svn surgery" email. Sorry.
>
> The Java server is currently the long sticking out thing that's
> holding up 0.5, and there's significant enough concern about some of
> the changes that have gone in that it's probably best to revert them.
> Martin, Marnie and, to a lesser extent, I have been working on these
> issues and feel that the best way forward is to back out the work
> around TransactionLog and flow to disk and ship without them.
>
> In the interests of doing so expediently and preserving a clear,
> coherent SVN history,  we're going to do the following:
>
> 1. copy trunk at a known good revision from before this work started
> onto a "newtip"[1] branch
> 2. use the new 1.5 svn merge tooling to take the good patches from
> trunk to newtip
> 2.5 test newtip to ensure that the resulting broker is sound, safe and sane.
> 3. move trunk/qpid/java/broker to a holding branch so that the work
> isn't lost and can be easily retrieved later
> 4. move newtip/qpid/java/broker to trunk/qpid/java/broker and copy it
> to 0.5-release/qpid/java/broker
>
> and then proceed from there. This should be the shortest path to a
> releasable code base, albiet unfortunately losing some features we'd
> love to have. That seems like a better plan than continuing to bug fix
> and delaying the other components unnecessarily.
>
> I'm not entirely sure about timescales, I expect that 4 will occur
> towards the middle of next week.
>
> Shout if you have a problem with this.
>
> - Aidan
>
> [1] probably not its actual name
> --
> Apache Qpid - World Domination through Advanced Message Queueing
> http://qpid.apache.org
>
> ---------------------------------------------------------------------
> Apache Qpid - AMQP Messaging Implementation
> Project:      http://qpid.apache.org
> Use/Interact: mailto:dev-subscribe@qpid.apache.org

Hi all following on from Aidan's email above. I'm just about to create
the branch and start merging over the revisions from the Java broker.
When the merges are complete there will be a heads up before copying
it back to trunk and then merging to 0.5 so we can get the release
out.

Cheers

Martin

-- 
Martin Ritchie

---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:dev-subscribe@qpid.apache.org


Mime
View raw message