Ted Gould wrote:
On Tue, 2006-06-20 at 17:16 -0500, Aaron Spike wrote:
Shall we merge the filters branch into trunk?
The only thing that makes me a little nervous about this is that part of the requirements from Google is that the code they work on gets submitted to Google. Google has agreed to take patches. So, I think working on a branch makes that much easier.
Oh, is that a new requirement? And will google provide a fancy tool for making that happen? :-) I would think this could be difficult for a bunch of open source projects to provide. By the very nature of open source, contributions are somewhat difficult to separate out. Now would it be possible for us to shell script a little tool that will create a series of patches labeled according to which repository revision they should be applied to? Would that satify Google?
Still I don't think you have provided a reason against merging the branch into trunk. A merge will not stop the branch from ending. A merge will just get their code a little much needed testing. Work can continue on the branch if that is desired, right?
If they do continue work on the branch it would be helpful to the students if trunk was merged back into the branch too. Does this invalidate the usefullness of the branch? How does the branch help with separating out the work of two SoCers from each other?
I still vote "merge". I think we will have some difficulties to address either way. But I think there is a large benefit to having the code in trunk.
Aaron