Elliot Metsger wrote:
[EMAIL PROTECTED] wrote:
>So I think we might need to release the current trunk (as Pluto 1.1.5
>or 1.2, whatever) *before* the 1.1-JSR-286-trunk-merge branch becomes
>trunk.
A few weeks ago, Elliot volunteered to do a Pluto 1.1.5 release and
was preparing that in the 1.1.x branch,
I'm still committed to doing a 1.1.5 release. Eric Dalquist is working
on a patch for the descriptor-impl. I think after that issue gets filed
and the patch committed we'll be ready for a 1.1.5 release.
which, I believe, is a clone of the trunk. Please comment, Elliot.
We've tried to keep the current trunk and the 1.1.x branch the same -
applying patches to both the branch and trunk when they come in. I
don't believe that the current trunk has any features or fixes that
aren't in 1.1.x.
Elliot
Great to hear from you Elliot.
So, if I understand this and your previous message correctly, there is no need to save any potentially unreleased changes in the current trunk as they are also
applied to the 1.1.x branch (target version currently at 1.1.5-SNAPSHOT).
In that case, I agree the easier solution is to simply drop trunk
(1.2.0-SNAPSHOT) and move 1.1-JSR-286-trunk-merge to trunk.
+1 for that resolution.
Regards,
Ate