> I think that PHP 5 (or whatever the latest major version of PHP in the > works is at a given moment) should be in HEAD, and not in a branch. CVS > branches are really useful for maintaining old versions, but I think HEAD > is the most suitable branch for ongoing development(*), and we're not > really using it with this setup. Using this approach, we'll develop PHP 5 > in HEAD, and once PHP 6 comes around the corner, we'd branch away a PHP_5 > branch, and HEAD will become PHP 6. It's pretty similar to the method > we've been using with mini versions.
I'm especially leaning towards consistency right now, probably because of the lack of it in past times. When we use PHP_X for PHP X, we have a permanently valid 1-1 association between source code and branch name which is the most transparent way to handle things IMHO.
My humble opinion differs. There's no need for all of the versions of PHP to have the same weight - the latest version, the one that's being actively worked on, should be the one in HEAD. As was evident in the past you're mostly interested in PHP 4, but most of the developers are interested in 5, and all of the new development is going there. There's no need to complicate things just for the sake of consistency, when we're dealing with two versions that are in completely in different stages in their life cycle.
> (*) You can use -A safely, some CVS features (at least in certain versions) > work sub-optimally when inside branches, etc.
I haven't run into these.. details would certainly simplify that decision.
Well, for once, you can't use -A, which is quite annoying to begin with. In addition, various versions of CVS don't handle multiple sticky tags too well - so if you'd like to say, update to a certain date in the branch - it won't work (you can have just one sticky tag - either date or branch). It appears to be fixed in the most recent versions of CVS but I bumped into it in many real-world systems. In general, the implementation of branches in CVS is very simplistic and suboptimal, and forcing people to always work with branches is not a good thing.
We should simply dump the PHP_5 branch and work on HEAD. Are these branches supposed to be in the same state right now?
Zeev
-- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
