Skip to content

Commit

Permalink
cvs->svn
Browse files Browse the repository at this point in the history
  • Loading branch information
rlerdorf committed Jul 13, 2009
1 parent 2ec070b commit 7a2141e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 41 deletions.
19 changes: 8 additions & 11 deletions INSTALL
Expand Up @@ -386,7 +386,7 @@ Apache 2.0 on Unix systems
http://snaps.php.net/php5-latest.tar.gz or download binaries for
Windows http://snaps.php.net/win32/php5-win32-latest.zip.
* a prerelease version downloadable from http://qa.php.net/.
* you have always the option to obtain PHP through anonymous CVS.
* you have always the option to obtain PHP through SVN.

These versions of PHP are compatible to Apache 2.0.40 and later.

Expand Down Expand Up @@ -1303,8 +1303,8 @@ Introduction to PECL Installations

When building PHP modules, it's important to have known-good versions
of the required tools (autoconf, automake, libtool, etc.) See the
Anonymous CVS Instructions for details on the required tools, and
required versions.
SVN Instructions for details on the required tools, and required
versions.
__________________________________________________________________

Downloading PECL extensions
Expand All @@ -1320,14 +1320,11 @@ Downloading PECL extensions
PECL extensions that have releases listed on the PECL web site are
available for download and installation using the pecl command.
Specific revisions may also be specified.
* CVS
Most PECL extensions also reside in CVS. A web-based view may be
seen at http://cvs.php.net/pecl/. To download straight from CVS,
the following sequence of commands may be used. Note that phpfi is
the password for user cvsread:

$ cvs -d:pserver:cvsread@cvs.php.net:/repository login
$ cvs -d:pserver:cvsread@cvs.php.net:/repository co pecl/extname
* SVN
All PECL files reside in SVN. A web-based view may be seen at
http://svn.php.net/pecl/. To download straight from SVN, use:

$ svn co http://svn.php.net/repository/pecl/<extname>/trunk <extname>

* Windows downloads
Windows users may find compiled PECL binaries by downloading the
Expand Down
40 changes: 10 additions & 30 deletions README.SUBMITTING_PATCH
Expand Up @@ -8,11 +8,11 @@ part is making it acceptable for inclusion into our repository. :-)

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
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)
We use Subversion (SVN) for revision control. You need to get the
source from SVN in order to create a patch. Read
http://www.php.net/svn.php for help on using SVN. You can check out
older branches, but make sure you get trunk as well and make your
patch work there.

Read CODING_STANDARDS file before you start working.

Expand All @@ -21,7 +21,7 @@ add a new feature to PHP. After you finished editing, please test your
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
Expand All @@ -41,25 +41,8 @@ maintainer and/or internals@lists.php.net, or pear-dev@lists.php.net if
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.


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.
If you are new to SVN (Subversion), visit
http://svnbook.red-bean.com/ for details.


Check list for submitting patch
Expand All @@ -70,10 +53,7 @@ Check list for submitting patch
web server error logs when you test your patch?
- 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?
- Did you update SVN source before you take final patch?
- Did you read the patch again?


Expand Down Expand Up @@ -118,7 +98,7 @@ these questions:

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.

Expand Down

0 comments on commit 7a2141e

Please sign in to comment.