I'll pull in the google-collections mods in revisions
724939,727033,727448 so future merges are less painful.
On Jan 7, 2009, at 10:02 AM, Kevin Brown wrote:
Id prefer only pulling in bug fixes. The pipelinig / proxied stuff
is way
too early for a release.
On Jan 7, 2009 7:28 AM, "Ian Boston" <[email protected]> wrote:
I have been attempting to merge changes from trunk into the 1.0.x
branch,
but it has wandered a bit. The result is that some fixes wont merge
without
re-work. In particular SHINDIG-785 which has dependencies on the
google
collections re-factor done mid December, which itself has other
dependencies. About 1/4 of the commits to trunk since 5 December
have been
merged into the branch.
IMHO we have 2 options.
1. re-branch
2. only apply a very limited set of patched from trunk to the branch.
Which one ?
The patch of least resistance says 2, but that could be hard for those
wanting to see fixes in the release.
Ian
Paul Lindner
[email protected]
