Re: Re: RFC:PHP Release Cycle

> 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. I think the "lots of developers" aspect is key here. If there were 4 of us we could work in a very different manner. We literally have hundreds now and the simpler we keep it the fewer headaches. We do in a sense always work on branches. Everyone is working on their own checked out copy and theoretically only commit when something is working. What we don't have are shared experimental branches. There is no reason not to have some of those. Creating a branch to do some sort of proof of concept should be fine. Once proven applying a diff to the main tree isn't that hard. And I prefer having a change like that coming into the main tree as a single commit with a single concise commit message as opposed to hundreds of small back and forth commits. -Rasmus