Skip to content

Commit f1f5e30

Browse files
committed
Initial rewrite of the references to Subversion on the site to Git. Rewrites
welcome! A couple of important notes: - I've largely dropped references to Subversion altogether, even knowing that php-doc hasn't migrated yet. We may need to put a few more "Git/SVN account" references in there if php-doc isn't going to be migrated in the near future. - I've removed the quick start hints from git-php.php after an account request has been sent in. The documentation there was pretty skimpy anyway and probably wouldn't have been enough to get a developer going, plus it's harder to distill the Git workflow into three or four snappy commands and I'm not really convinced that a form confirmation page is the right place to have learning materials, since it's a one-time page for most users. Instead I've replaced them with links to the relevant Wiki pages, which seem more likely to be the right place for new developers to learn. News post to come, but I wanted to separate this out for easier review.
1 parent 2678a6f commit f1f5e30

14 files changed

+196
-161
lines changed

downloads.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</p>
3737
<p>
3838
To download the very latest development version,
39-
see the <a href="svn.php">instructions on
40-
using SVN</a>
39+
see the <a href="git.php">instructions on using Git</a>.
4140
</p>
4241
<div class="information">
4342
<p>

error.php

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,17 +428,23 @@
428428
"projects.php" => "projects", // BC
429429

430430
# CVS -> SVN
431-
"anoncvs.php" => "svn",
432-
"cvs-php.php" => "svn-php",
431+
"anoncvs.php" => "git",
432+
"cvs-php.php" => "git-php",
433+
434+
# SVN -> Git
435+
"svn" => "git",
436+
"svn-php" => "git-php",
437+
438+
# Other items
433439
"security/crypt" => "security/crypt_blowfish",
434440
);
435441

436442
$external_redirects = array(
437-
"php4news" => "http://svn.php.net/viewvc/php/php-src/branches/PHP_4_4/NEWS?view=markup",
438-
"php5news" => "http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/NEWS?view=markup", // BC
439-
"php53news" => "http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/NEWS?view=markup",
440-
"php54news" => "http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/NEWS?view=markup",
441-
"phptrunknews"=> "http://svn.php.net/viewvc/php/php-src/trunk/NEWS?view=markup",
443+
"php4news" => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-4.4",
444+
"php5news" => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.4",
445+
"php53news" => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.3",
446+
"php54news" => "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/PHP-5.4",
447+
"phptrunknews"=> "https://git.php.net/?p=php-src.git;a=blob_plain;f=NEWS;hb=refs/heads/master",
442448
"projects" => "http://freshmeat.net/tags/php",
443449
"pear" => "http://pear.php.net/",
444450
"bugs" => "http://bugs.php.net/",

get-involved.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
</p>
6161

6262
<p>
63-
Once you have the build dependencies installed you'll need to checkout PHP from SVN, configure and build it;
63+
Once you have the build dependencies installed you'll need to checkout PHP from Git, configure and build it;
6464
<ul>
65-
<li>svn co https://svn.php.net/repository/php/php-src/branches/PHP_5_4 php54</li>
66-
<li>cd php54</li>
65+
<li>git clone -b PHP-5.4 http://git.php.net/repository/php-src.git php-5.4</li>
66+
<li>cd php-5.4</li>
6767
<li>./buildconf</li>
6868
<li>./configure (see the <a href="#config.nice">shell script helper below)</a></li>
6969
<li>make all test</li>
@@ -262,11 +262,11 @@ functionality with extensions, and so on.
262262
<p style="margin: 5px; padding: 5px;">
263263
Even though most of the mailing lists are very active, not everything that is
264264
contributed to PHP needs to be approved there first. For example, minor
265-
features are often simply committed directly to SVN without asking or telling
265+
features are often simply committed directly to Git without asking or telling
266266
anyone. These are typically things for which a developer working on an
267267
external application saw a need and decided to add, in case anyone else might
268268
need it in the future. PHP has a great peer review process so it's very hard
269-
to "sneak" things in. Every commit to SVN is reviewed by quite a lot of people
269+
to "sneak" things in. Every commit to Git is reviewed by quite a lot of people
270270
who are interested in what is going on - or who simply enjoy reading code. If
271271
a reviewer discovers issues with the commit, he or she will send a quick reply
272272
to the commit email and discuss it on the developers list. Often the peer review
@@ -325,20 +325,20 @@ functionality with extensions, and so on.
325325

326326
<p style="margin: 5px; padding: 5px;">
327327
Getting involved is a lot easier than most people think - and chances are that
328-
you are already involved in one way or another. You don't need an SVN account
329-
and commit access to get started - SVN accounts need to be earned. Registering
328+
you are already involved in one way or another. You don't need an Git account
329+
and commit access to get started - Git accounts need to be earned. Registering
330330
on the mailing lists related to the topic in which you are interested - and
331331
actively participating in the discussions - is a good start toward getting
332-
your request for an SVN account granted. Browse the wiki to see if there are
332+
your request for an Git account granted. Browse the wiki to see if there are
333333
outstanding TODO items you can help to clear, for example. Another great way
334334
to get involved and really help out is by reviewing the bug tracker for bugs
335335
you could potentially fix, or perhaps for which you could write a unit test.
336-
Sending several patches to the mailing lists will quickly show that you are
337-
interested and serious about your desire to contribute. Eventually someone
338-
will get annoyed with the amount of time they must spend to commit your patches
339-
for you, and will probably respond with something along the lines of, "Stop
340-
bothering me. Do it yourself!" and ask you to submit the SVN account form.
341-
Mission accomplished!
336+
Sending several pull requests, or attaching patches to bug reports will
337+
quickly show that you are interested and serious about your desire to
338+
contribute. Eventually someone will get annoyed with the amount of time
339+
they must spend to commit your patches for you, and will probably respond
340+
with something along the lines of, "Stop bothering me. Do it yourself!" and
341+
ask you to submit the Git account form. Mission accomplished!
342342
</p>
343343

344344

@@ -387,7 +387,7 @@ functionality with extensions, and so on.
387387
<p style="margin: 5px; padding: 5px;">
388388
Unsure which task to tackle first? Stuck on a problem? Need a
389389
quick brainstorming session? IRC is a very convenient way to get
390-
help quickly for smaller things, such as "where was the SVN module
390+
help quickly for smaller things, such as "where was the Git module
391391
for zyx?" or if you simply want to run an idea by people to get
392392
their opinions - or even just to hang out. There aren't any
393393
"official" IRC channels for the PHP project, but a good chunk of
@@ -469,8 +469,8 @@ functionality with extensions, and so on.
469469
and therefore it will allow anonymous users to "login" and use the
470470
application. Modification, validation, translation, creation of new files,
471471
and everything else you need for writing documentation is possible without
472-
an SVN account. When saving changes, a patch will be created and saved to
473-
the "patch queue," while pending approval by someone with SVN karma to
472+
an Git account. When saving changes, a patch will be created and saved to
473+
the "patch queue," while pending approval by someone with Git karma to
474474
commit the changes. PhD O.E. also bundles a variety of scripts to ensure the
475475
docs use a consistent structure, allow the contributor to view undocumented
476476
functions, and check the translation status of an entry (among other things).

0 commit comments

Comments
 (0)