> 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. > (*) 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. - Sascha -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php