From: Marcus Boerger Date: Sun, 21 May 2006 09:12:34 +0000 (+0000) Subject: - Update X-Git-Tag: php-5.2.0RC1~500 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abcee636358085db83be29b6ddaa8e53b65a6e39;p=php - Update --- diff --git a/README.CVS-RULES b/README.CVS-RULES index 43240c816b..1075f82203 100644 --- a/README.CVS-RULES +++ b/README.CVS-RULES @@ -29,14 +29,22 @@ Having said that, here are the organizational rules: 5. If you don't know how to do something, ask first! 6. Test your changes before committing them. We mean it. Really. + To do so use "make test". + + 7. For development use the --enable-maintainer-zts switch to ensure your + code handles TSRM correctly and doesn't break for thos who need that. Currently we have the following branches in use: HEAD Will become PHP 6.0. This CVS branch is for active development. -PHP_5_1 Is used to release the PHP 5.1.x series. Only minor feature - enhancements may go in here, but please keep that as infrequent as - possible. +PHP_5_2 Is used to release the PHP 5.2.x series. Only minor feature + enhancements may go in here, but please keep that as infrequent as + possible. +PHP_5_1 Is used to release the PHP 5.1.x series. Only bugfixes are permitted + on this branch (Consult the releasemaster prior to commit). +PHP_5_0 This branch is closed. PHP_4_4 Is used to release the PHP 4.4.x series. Only bugfixes are permitted - on this branch. + on this branch (Consult the releasemaster prior to commit). +PHP_4_3 This branch is closed. The next few rules are more of a technical nature.