[PHP-CVS] cvs: php-src(PHP_5_3) / README.CVS-RULES
kalle Mon Nov 10 22:10:59 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.CVS-RULES Log: MFH: State that bugs should be sorted desc. http://cvs.php.net/viewvc.cgi/php-src/README.CVS-RULES?r1=1.18.2.1.2.2.2.3r2=1.18.2.1.2.2.2.4diff_format=u Index: php-src/README.CVS-RULES diff -u php-src/README.CVS-RULES:1.18.2.1.2.2.2.3 php-src/README.CVS-RULES:1.18.2.1.2.2.2.4 --- php-src/README.CVS-RULES:1.18.2.1.2.2.2.3 Sun Nov 9 12:13:04 2008 +++ php-src/README.CVS-RULESMon Nov 10 22:10:59 2008 @@ -132,6 +132,9 @@ These files are updated once a day, so your stuff will not show up until somewhat later. +When you change the NEWS file for a bug fix, then please keep the bugs +sorted in decreasing order under the fixed version. + You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/) to look at PHP CVS repository in various ways. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / README.CVS-RULES
lsmith Sun Nov 9 12:13:04 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.CVS-RULES Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.CVS-RULES?r1=1.18.2.1.2.2.2.2r2=1.18.2.1.2.2.2.3diff_format=u Index: php-src/README.CVS-RULES diff -u php-src/README.CVS-RULES:1.18.2.1.2.2.2.2 php-src/README.CVS-RULES:1.18.2.1.2.2.2.3 --- php-src/README.CVS-RULES:1.18.2.1.2.2.2.2 Sat Nov 24 13:52:29 2007 +++ php-src/README.CVS-RULESSun Nov 9 12:13:04 2008 @@ -53,36 +53,38 @@ PHP_5_1 This branch is closed. - PHP_4_4 Is used to release the PHP 4.4.x series. Only bugfixes are permitted - on this branch (Consult the releasemaster prior to commit). - - PHP_4_3 This branch is closed. + PHP_4_4 This branch is closed. The next few rules are more of a technical nature:: - 1. DO NOT TOUCH ChangeLog! It is automagically updated from the commit + 1. All changes should first go to HEAD and then get merged from HEAD + (aka MFH'ed) to all other relevant branches. + + 2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit messages every day. Woe be to those who attempt to mess with it. - 2. All news updates intended for public viewing, such as new features, - bug fixes, improvements, etc., should go into the NEWS file. + 3. All news updates intended for public viewing, such as new features, + bug fixes, improvements, etc., should go into the NEWS file of the + *first* to be released version with the given change. In other words + any NEWS file change only needs to done in one branch. NB! Lines, starting with @ will go automagically into NEWS file, but this is NOT recommended, though. Please, add news entries directly to NEWS file and don't forget to keep them adjusted and sorted. - 3. Do not commit multiple file and dump all messages in one commit. If you + 4. Do not commit multiple file and dump all messages in one commit. If you modified several unrelated files, commit each group separately and provide a nice commit message for each one. See example below. - 4. Do write your commit message in such a way that it makes sense even + 5. Do write your commit message in such a way that it makes sense even without the corresponding diff. One should be able to look at it, and immediately know what was modified. Definitely include the function name in the message as shown below. - 5. In your commit messages, keep each line shorter than 80 characters. And + 6. In your commit messages, keep each line shorter than 80 characters. And try to align your lines vertically, if they wrap. It looks bad otherwise. - 6. If you modified a function that is callable from PHP, prepend PHP to + 7. If you modified a function that is callable from PHP, prepend PHP to the function name as shown below. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.CVS-RULES
Why not MFH to the stable branch too? a.k.a. PHP_5_2.. --Jani Lukas Smith kirjoitti: lsmith Sun Nov 9 12:13:04 2008 UTC Modified files: (Branch: PHP_5_3) /php-src README.CVS-RULES Log: MFH http://cvs.php.net/viewvc.cgi/php-src/README.CVS-RULES?r1=1.18.2.1.2.2.2.2r2=1.18.2.1.2.2.2.3diff_format=u Index: php-src/README.CVS-RULES diff -u php-src/README.CVS-RULES:1.18.2.1.2.2.2.2 php-src/README.CVS-RULES:1.18.2.1.2.2.2.3 --- php-src/README.CVS-RULES:1.18.2.1.2.2.2.2 Sat Nov 24 13:52:29 2007 +++ php-src/README.CVS-RULESSun Nov 9 12:13:04 2008 @@ -53,36 +53,38 @@ PHP_5_1 This branch is closed. - PHP_4_4 Is used to release the PHP 4.4.x series. Only bugfixes are permitted - on this branch (Consult the releasemaster prior to commit). - - PHP_4_3 This branch is closed. + PHP_4_4 This branch is closed. The next few rules are more of a technical nature:: - 1. DO NOT TOUCH ChangeLog! It is automagically updated from the commit + 1. All changes should first go to HEAD and then get merged from HEAD + (aka MFH'ed) to all other relevant branches. + + 2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit messages every day. Woe be to those who attempt to mess with it. - 2. All news updates intended for public viewing, such as new features, - bug fixes, improvements, etc., should go into the NEWS file. + 3. All news updates intended for public viewing, such as new features, + bug fixes, improvements, etc., should go into the NEWS file of the + *first* to be released version with the given change. In other words + any NEWS file change only needs to done in one branch. NB! Lines, starting with @ will go automagically into NEWS file, but this is NOT recommended, though. Please, add news entries directly to NEWS file and don't forget to keep them adjusted and sorted. - 3. Do not commit multiple file and dump all messages in one commit. If you + 4. Do not commit multiple file and dump all messages in one commit. If you modified several unrelated files, commit each group separately and provide a nice commit message for each one. See example below. - 4. Do write your commit message in such a way that it makes sense even + 5. Do write your commit message in such a way that it makes sense even without the corresponding diff. One should be able to look at it, and immediately know what was modified. Definitely include the function name in the message as shown below. - 5. In your commit messages, keep each line shorter than 80 characters. And + 6. In your commit messages, keep each line shorter than 80 characters. And try to align your lines vertically, if they wrap. It looks bad otherwise. - 6. If you modified a function that is callable from PHP, prepend PHP to + 7. If you modified a function that is callable from PHP, prepend PHP to the function name as shown below. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / README.CVS-RULES
On 09.11.2008, at 16:16, Jani Taskinen wrote: Why not MFH to the stable branch too? a.k.a. PHP_5_2.. in the past i have been told to not MFH these kinds of README changes to maintenance branches. regards, Lukas Kahwe Smith [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / README.CVS-RULES
lsmith Sat Nov 24 13:52:29 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcREADME.CVS-RULES Log: - MFH http://cvs.php.net/viewvc.cgi/php-src/README.CVS-RULES?r1=1.18.2.1.2.2.2.1r2=1.18.2.1.2.2.2.2diff_format=u Index: php-src/README.CVS-RULES diff -u php-src/README.CVS-RULES:1.18.2.1.2.2.2.1 php-src/README.CVS-RULES:1.18.2.1.2.2.2.2 --- php-src/README.CVS-RULES:1.18.2.1.2.2.2.1 Thu Nov 22 18:13:05 2007 +++ php-src/README.CVS-RULESSat Nov 24 13:52:29 2007 @@ -48,9 +48,8 @@ PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for larger enhancements. - 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_2 Is used to release the PHP 5.2.x series. Only bugfixes are permitted + on this branch (Consult the releasemaster prior to commit). PHP_5_1 This branch is closed. @@ -95,7 +94,7 @@ in the ChangeLog. Everything else goes into the ChangeLog. It is important to note that if your comment or news logline spans multiple -lines, you have to put # at the beginning of _every_ such line. +lines, you have to put # at the beginning of **every** such line. Example. Say you modified two files, datetime.c and string.c. In datetime.c you added a new format option for the date() function, and in string.c you fixed a -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
