Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:2669 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 70224 invoked from network); 23 Jun 2003 22:04:40 -0000 Received: from unknown (HELO mail.zend.com) (192.117.235.230) by pb1.pair.com with SMTP; 23 Jun 2003 22:04:40 -0000 Received: (qmail 21530 invoked from network); 23 Jun 2003 22:04:36 -0000 Received: from localhost (HELO zeev-laptop.zend.com) (127.0.0.1) by localhost with SMTP; 23 Jun 2003 22:04:36 -0000 Reply-To: zeev@zend.com Message-ID: <5.1.0.14.2.20030624010523.02b41dd8@localhost> X-Sender: zeev@localhost X-Mailer: QUALCOMM Windows Eudora Version 5.1 Date: Tue, 24 Jun 2003 01:14:17 +0300 To: Sascha Schumann Cc: internals@lists.php.net In-Reply-To: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; format=flowed Subject: Re: [PHP-DEV] HEADS UP: CVS changes From: zeev@zend.com (Zeev Suraski) References: 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.