archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- cvs->svn

Browse source
This commit is contained in:
David Soria Parra 2009-07-14 09:37:57 +00:00
parent 8cd2d9facb
commit a7db2251dd
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
README.CVS-RULES → README.SVN-RULES
View file

@ -1,18 +1,18 @@
==================== ====================
CVS Commit Rules SVN Commit Rules
==================== ====================
This is the first file you should be reading after you get your CVS account. This is the first file you should be reading after you get your SVN account.
We'll assume you're basically familiar with CVS, but feel free to post We'll assume you're basically familiar with SVN, but feel free to post
your questions on the mailing list. Please have a look at your questions on the mailing list. Please have a look at
http://cvsbook.red-bean.com/ for more detailed information on CVS. http://svnbook.red-bean.com/ for more detailed information on SVN.
PHP is developed through the efforts of a large number of people. PHP is developed through the efforts of a large number of people.
Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
some basic rules with regards to CVS usage will:: some basic rules with regards to SVN usage will::
a. Make everybody happier, especially those responsible for maintaining a. Make everybody happier, especially those responsible for maintaining
the CVS itself. the SVN itself.
b. Keep the changes consistently well documented and easily trackable. b. Keep the changes consistently well documented and easily trackable.
@ -43,21 +43,21 @@ Having said that, here are the organizational rules::
Currently we have the following branches in use:: Currently we have the following branches in use::
HEAD Will become PHP 6.0. This CVS branch is for active development. trunk Will become PHP 6.0. This branch is for active development.
PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for branches/PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for
larger enhancements. larger enhancements.
PHP_5_2 Is used to release the PHP 5.2.x series. Only bugfixes are permitted branches/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). on this branch (Consult the releasemaster prior to commit).
PHP_5_1 This branch is closed. branches/PHP_5_1 This branch is closed.
PHP_4_4 This branch is closed. branches/PHP_4_4 This branch is closed.
The next few rules are more of a technical nature:: The next few rules are more of a technical nature::
1. All changes should first go to HEAD and then get merged from HEAD 1. All changes should first go to trunk and then get merged from trunk
(aka MFH'ed) to all other relevant branches. (aka MFH'ed) to all other relevant branches.
2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit 2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
@ -122,7 +122,7 @@ get notified about your commit through the php-doc mailing list.
If you fix some bugs, you should note the bug ID numbers in your If you fix some bugs, you should note the bug ID numbers in your
commit message. Bug ID should be prefixed by "#" for easier access to commit message. Bug ID should be prefixed by "#" for easier access to
bug report when developers are browsing CVS via LXR or Bonsai. bug report when developers are browsing SVN via LXR or Bonsai.
Example:: Example::
@ -136,7 +136,7 @@ When you change the NEWS file for a bug fix, then please keep the bugs
sorted in decreasing order under the fixed version. sorted in decreasing order under the fixed version.
You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/) You can use LXR (http://lxr.php.net/) and Bonsai (http://bonsai.php.net/)
to look at PHP CVS repository in various ways. to look at PHP SVN repository in various ways.
To receive daily updates to ChangeLog and NEWS, send an empty message to To receive daily updates to ChangeLog and NEWS, send an empty message to
php-cvs-daily-subscribe@lists.php.net. php-cvs-daily-subscribe@lists.php.net.