On Mon, 23 Jun 2003, Sascha Schumann wrote:
>     Here is a plan.
>
>     - rename /repository/php5 to /repository/php-src
>     - copy PHP_4_3 tags to PHP_4 branch (i.e. reset the PHP 4
>       head branch to the current 4.3 code)
>     - workaround Zend/ZendEngine2 issue (they should be in the
>       same module) by using CVS aliases
>     - rm -rf /repository/php4
>     - reapply the 3 or 4 patches to the PHP_4_3 branch
>
>     And first and foremost:
>
>     - Make branch names crystal clear to developers


Just to clarify.  The proposal is:

                                  PHP_4_3_2  PHP_4_3_3
                                     /      /
                                    /      /
                               ----/------/------PHP_4_3
                              /
                             /       ------------- PHP_4_4
                            /       /
                 ----------/-------/------------------ PHP_4
                /
               /
php-src ------/---------\-------------------- HEAD
                         \
                          -------------\-------------- PHP_5
                                        \
                                         ---\------- PHP_5_0
                                             \
                                              \
                                             PHP_5_0_0


If so, I am all for it.  A version-agnostic php-src module with
appropriate branches and tags would be very nice.  This tree looks more
complicated than it actually is.  Obviously a number of the branches are
inactive and don't really exist until an appropriate merge is done.

If you have time to do it, go for it.  Disable cvs access for a while and
apply some magic.

-Rasmus

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

Reply via email to