[EMAIL PROTECTED] wrote:
Hi Elliot,
When I committed the last couple of issue fixes to SVN, I found
discrepancies between trunk and the pluto-1.1.x branch when I tried to
apply them to the pluto-1.1.x branch (outside of JDK 1.4 vs 1.5
differences).
What commits have you had difficulties applying? I'm looking back over
the commit emails -
Was it the upgrade to Tomcat 5.5.23 that got applied to trunk but not
the branch (554644)? And/or the documentation update (554313)?
FWIW, I've been creating a fix and applying it to the 1.1.x branch and
then simultaneously applying that patch to the trunk.
If 1.1.x is suppose to be a mirror of the trunk, sans JDK
1.5, I think a merge should be done between trunk and pluto-1.1.x branch
before the 1.1.4 release is cut (refactoring out the JDK 1.5-1.4
differences).
Ok, I'll diff the two and see how badly things are out of whack. I'm
not convinced we need to do a merge as long as long as all the issues
are actually getting fixed, and that we don't have regressions when 1.2
is eventually released.
At the same time if there is/are trouble applying patches we should take
a look. If you can let me know specific revisions you had trouble with
I'd appreciate it. This is of course the cost of branch maintenance. :-)
I can help, if you need it.
Definitely, thanks Craig,
Elliot
/Craig
Original Message:
-----------------
From: Elliot Metsger [EMAIL PROTECTED]
Date: Mon, 09 Jul 2007 23:05:58 -0400
To: [email protected]
Subject: 1.1.4 Release
Wow,
The community has been rolling right along these past few days, and I
think we're approaching the point where we can consider a 1.1.4 release.
Ideally I'd like to post candidates this coming weekend.
All except one of 22 issues scheduled for 1.1.4 have been resolved.
* PLUTO-360 FileAssemblerTest cannot be executed offline: I think this
can be pushed. We need to upgrade to the latest XMLUnit, but as of now
it hasn't been published in the Maven 2 repo.
* PLUTO-390 EarAssemblerTest failure: This isn't scheduled for 1.1.4 but
that's because no one has confirmed that it affects the 1.1.x branch.
It probably does affect the branch, so this should be fixed.
I think there are some minor website updates which I'll work on this
evening.
What do others think?
Thanks,
Elliot
--------------------------------------------------------------------
mail2web.com – Enhanced email for the mobile individual based on Microsoft®
Exchange - http://link.mail2web.com/Personal/EnhancedEmail
