At 00:37 24/06/2003, Sascha Schumann wrote:
The great unification has commenced.

    There is now a single module php-src which contains all PHP 4
    and PHP 5 branches.

BRANCH INFORMATION

    Please make yourself familiar with the "cvs checkout -r
    BRANCH" notation.  It will be necessary from now on for a
    checkout.

Some examples:

    PHP 5:      cvs co -r PHP_5   php-src-ze2
    PHP 4:      cvs co -r PHP_4   php-src-ze1
    PHP 4.3:    cvs co -r PHP_4_3 php-src-ze1

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.


Thoughts?

Zeev

(*) You can use -A safely, some CVS features (at least in certain versions) work sub-optimally when inside branches, etc.


-- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php



Reply via email to