[PATCH] README file reference changes
[email protected] (Herman Radtke) Fri, 10 Jul 2009 23:27:18 -0700
| Newsgroups | svn.migration |
|---|---|
| Message-ID | <[email protected]> |
Here are some non-critical CVS reference changes to spare you guys some busy work. I listed the issue on http://wiki.php.net/vcs/svnfaq/firefighting as well. The README.QNX file still contains some CVS references, but I am not sure that file is even relevant anymore so I did not change it. Herman Radtke
README.CVS-RULES.patch.txt
(text/plain, 3 KB)
Index: README.CVS-RULES
===================================================================
--- README.CVS-RULES (revision 283789)
+++ README.CVS-RULES (working copy)
@@ -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.
-We'll assume you're basically familiar with CVS, but feel free to post
+This is the first file you should be reading after you get your SVN account.
+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
-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.
-Collaboration is a Good Thing(tm), and CVS lets us do this. Thus, following
-some basic rules with regards to CVS usage will::
+Collaboration is a Good Thing(tm), and SVN lets us do this. Thus, following
+some basic rules with regards to SVN usage will::
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.
@@ -39,11 +39,11 @@
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.
+ code handles TSRM correctly and doesn't break for those who need that.
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 is for active development.
PHP_5_3 Is used to release the PHP 5.3.x series. It still allows for
larger enhancements.
@@ -57,7 +57,7 @@
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.
2. DO NOT TOUCH ChangeLog! It is automagically updated from the commit
@@ -122,7 +122,7 @@
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
-bug report when developers are browsing CVS via LXR or Bonsai.
+bug report when developers are browsing SVN via ViewVC.
Example::
@@ -135,11 +135,11 @@
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.
+You can use ViewVC (http://svn.php.net/) to look at PHP SVN repository
+in various ways.
To receive daily updates to ChangeLog and NEWS, send an empty message to
[email protected].
[email protected].
Happy hacking,
README.RELEASE_PROCESS.patch.txt
(text/plain, 1.1 KB)
Index: README.RELEASE_PROCESS =================================================================== --- README.RELEASE_PROCESS (revision 283789) +++ README.RELEASE_PROCESS (working copy) @@ -20,7 +20,7 @@ 5. Verify the tags to be extra sure everything was tagged properly. -6. Moving extensions from/to PECL requires root level access to the CVS server. +6. Moving extensions from/to PECL requires root level access to the SVN server. Contact [email protected] to get this taken care of. Moving extensions from php-src to PECL @@ -160,11 +160,11 @@ 11. run: ``./makedist php 4.4.1``, this will export the tree, create configure and build two tarballs (one gz and one bz2). -12. Commit those two tarballs to CVS (phpweb/distributions) +12. Commit those two tarballs to SVN (phpweb/distributions) 13. Once the release has been tagged, contact the PHP Windows development team ([email protected]) so that Windows binaries can be created. Once -those are made, they should be committed to CVS too. +those are made, they should be committed to SVN too. 14. Check if the pear files are updated (phar for 5.1+ or run pear/make-pear-bundle.php with 4.4)
README.SUBMITTING_PATCH.patch.txt
(text/plain, 2.8 KB)
Index: README.SUBMITTING_PATCH =================================================================== --- README.SUBMITTING_PATCH (revision 283789) +++ README.SUBMITTING_PATCH (working copy) @@ -8,11 +8,11 @@ How to create patch? -------------------- -We are working with CVS. You need to get CVS source to create a patch -that we accept. Visit http://www.php.net/anoncvs.php to get CVS +We are working with SVN. You need to get SVN source to create a patch +that we accept. Visit http://www.php.net/anonsvn.php to get SVN source. You can check out older versions, but make sure you get -the default branch (i.e. Do not use -r option when you check out the -CVS source) +the HEAD of the branch (i.e. Do not use -r option when you check out +the SVN source). Read CODING_STANDARDS file before you start working. @@ -21,7 +21,7 @@ patch. Read README.TESTING for testing. After you finish testing your patch, take diff file using -"cvs diff > your.patch" command. +"svn diff > your.patch" command. Read README.TESTING for submitting a test script for your patch. This is not strictly required, but it is preferred to submit a test script along @@ -41,27 +41,10 @@ you are patching PEAR. Official module maintainers can be found in EXTENSIONS file in PHP source. -If you are new to CVS (Concurrent Versions System), visit -http://cvshome.org/ for details. +If you are new to SVN (Subversion), visit +http://svnbook.red-bean.com/ for details. -Recommended CVS client settings for creating patch file ------------------------------------------------------- -Recommended ~/.cvsrc file setting is: ------- -cvs -z3 -update -d -P -checkout -P -diff -u - ------- -diff -u means: - -u Use the unified output format. - -With this CVS setting, you don't have to worry about adding/deleting -newlines and spaces. - - Check list for submitting patch ------------------------------- - Did you run "make test" to check if your patch didn't break @@ -71,9 +54,8 @@ - Did you build PHP for multi-threaded web servers. (Optional) - Did you create test script for "make test"? (Recommended) - Did you check your patch is unified format and it does not - contain white space changes? (If you are not using recommended - cvs setting) - - Did you update CVS source before you take final patch? + contain white space changes? + - Did you update SVN source before you take final patch? - Did you read the patch again? @@ -118,7 +100,7 @@ What happens when your patch is applied? ---------------------------------------- -Your name will be included together with your email address in the CVS +Your name will be included together with your email address in the SVN commit log. If your patch affects end-users, a brief description and your name might be added to the NEWS file.