Re: Re: RFC:PHP Release Cycle

At 03:49 PM 11/9/00 -0800, Rasmus Lerdorf wrote:

I have done some work with CVS branches and I don't find them that evil. It actually worked quite well for me. I am not quite sure we would have problems to create a release branch, apply the patch there and merge it into the main branch. I am not convinced that it's better for the person to make two separate patches. I think the patch should go into the main branch first for general perusal. There may of course be instances where the main branch and the release branch differ to the extent that the patch won't be the same as the patch for the release branch, but I have a feeling those instances won't be too frequent. Once enough people have looked at it and agreed that the fix is needed in the release branch then the release manager, or the release team, however we handle it can apply that change to the release branch. I have done a lot of CVS work over the years and I have constantly seen developers have problems trying to merge branches and I don't think we really need this merge in this case.

I guess doing a merge is not 100% necessary as a diff can be applied to the second branch. In a perfect world we would actually work with branches much more often (i.e. for any significant change and only merge it when we feel it's ready). But as it's not a perfect world and we're dealing with CVS and lots of developers doing it the way you guys mentioned probably makes most sense. Andi --- Andi Gutmans <andi@zend.com> http://www.zend.com/