I'm not really sure what the code currently is thats in contrib, maybe only remove the modules from contrib that are getting overwritten by the modules moved out of trunk? But that may make it harder to do, its all going to be in SVN history anyway so whatever makes the trunk cleaning up easiest i guess.
...ant On Fri, Jan 30, 2009 at 5:11 AM, Luciano Resende <[email protected]>wrote: > So, just want to confirm the steps : > > - Remove all old modules from contrib as we have merged all 1.x to > current 2.x trunk > - Start moving current trunk modules, that are not currently on the > build to contrib. > > Does it sound right ? If so I'll do it tomorrow together with 2.0M1 RC > preparations > > On Thu, Jan 29, 2009 at 5:53 AM, Simon Laws <[email protected]> > wrote: > > > > > > On Thu, Jan 29, 2009 at 1:13 PM, Mark Combellack <[email protected] > > > > wrote: > >> > >> +1 from me to moving old code out of the main trunk into contrib. It is > >> hard to tell what is current 2.x code and what is not. > >> > >> > >> > >> Mark > >> > >> > >> > >> ________________________________ > >> > >> From: ant elder [mailto:[email protected]] > >> Sent: 29 January 2009 11:57 > >> To: [email protected] > >> Subject: Cleaning up trunk so its clearer whats in and whats not done > yet > >> > >> > >> > >> This came up a while back IIRC but we didn't yet progress it - how about > >> we move all the stuff (modules, samples, itests etc) that has not yet > been > >> brought up to 2.x out of the main trunk and into the contrib folder? Old > >> stuff is not included in the build so having it there doesn't help with > >> refactoring or anything I can think of and a lot of its quite old now so > it > >> might be better to take the 1.x versions when starting to bring up > >> something, can anyone think of why we shouldn't do this? > >> > >> ...ant > > > > +1 from me. I think Ant's right that that's the approach we discussed a > > while back when we started out with 2.x. There is a load of stuff already > in > > contrib and I don't quite remember how we arrived at that. I seem to > > remember Luciano did a merge from the old equinox branch and I assume > that > > what was in trunk went to contrib and the merged results went into > modules > > etc. If that is the case (Luciano?) I guess we can just remove any > > duplicates that are in contrib now and, as Ant says, move unused > modules, > > itests etc into contrib. > > > > Simon > > > > > > -- > Luciano Resende > Apache Tuscany, Apache PhotArk > http://people.apache.org/~lresende <http://people.apache.org/%7Elresende> > http://lresende.blogspot.com/ >
