On Wed, 21 Jun 2006, Aaron Spike wrote:
Ted Gould wrote:
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?
I was thinking that maybe we could do something like that. They said that a diff is okay, but they didn't say anything about multiple diffs.
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.
Yes, I agree. I wasn't trying to say "don't do it", more just "be aware of this".
--Ted