Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:23608
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Message-ID: <44702891.8070306@album.co.nz>
Date: Sun, 21 May 2006 20:45:05 +1200
Organization: Album Limited
User-Agent: Thunderbird 1.5.0.2 (Windows/20060308)
MIME-Version: 1.0
To: Markus Fischer <markus@fischer.name>
CC: internals@lists.php.net
References: <44702771.2040003@fischer.name>
In-Reply-To: <44702771.2040003@fischer.name>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] README.CVS very small updates
From: jasper@album.co.nz (Jasper Bryant-Greene)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160

Hi Markus,

| +PHP_4_4  Is used to release the PHP 4.3.x series. Only bugfixes are
| permitted
|           on this branch.

Should that be "Is used to release the PHP 4.4.x series"?

Jasper


Markus Fischer wrote:
> Hi,
> 
> attached are just a few one-line changes to the current
> README.CVS-RULES files in 5.2 and HEAD, maybe it needs even more
> massaging.
> 
> - Markus

- ------------------------------------------------------------------------

Index: README.CVS-RULES
===================================================================
RCS file: /repository/php-src/README.CVS-RULES,v
retrieving revision 1.19
diff -u -r1.19 README.CVS-RULES
- --- README.CVS-RULES	17 Aug 2005 19:52:03 -0000	1.19
+++ README.CVS-RULES	21 May 2006 08:35:06 -0000
@@ -34,11 +34,11 @@
       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 5.1. This CVS branch is for active development.
- -PHP_5_0  Is used to release the PHP 5.0.x series. Only minor feature
+HEAD     Will become PHP 6.0. This CVS branch is for active development.
+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_4_3  Is used to release the PHP 4.3.x series. Only bugfixes are
permitted
+PHP_4_4  Is used to release the PHP 4.3.x series. Only bugfixes are
permitted
          on this branch.

 The next few rules are more of a technical nature.


- ------------------------------------------------------------------------

Index: README.CVS-RULES
===================================================================
RCS file: /repository/php-src/README.CVS-RULES,v
retrieving revision 1.18.2.1
diff -u -r1.18.2.1 README.CVS-RULES
- --- README.CVS-RULES	4 Dec 2005 23:19:44 -0000	1.18.2.1
+++ README.CVS-RULES	21 May 2006 08:35:37 -0000
@@ -30,8 +30,12 @@

    6. Test your changes before committing them. We mean it. Really.

+   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_2  Is used to release the PHP 5.2.x series.
 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.



- --
Jasper Bryant-Greene
General Manager
Album Limited

http://www.album.co.nz/     0800 4 ALBUM
jasper@album.co.nz          021 708 334
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (MingW32)

iD8DBQFEcCiRFfAeHhDzT4gRAzf4AKCERz5BQE4L9a+nbMwfVYnvudKcGgCg7ZIe
r8kq+lea7PizkRdwdPNmZEQ=
=bacG
-----END PGP SIGNATURE-----