PHP Wiki - vcs

commit-signing

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2021/04/01 14:56		current
Line 341:		Line 341:
	==== Do I need a passphrase? ====		==== Do I need a passphrase? ====

-	Yes. If you're private key falls into the wrong hands, they'll be unable to use the key without the passphrase.	+	Yes. If your private key falls into the wrong hands, they'll be unable to use the key without the passphrase.

	==== Should my key expire? ====		==== Should my key expire? ====

-	This guide created an immortal key (see step 2). If you are sufficiently paranoid and do not mind periodic bookkeeping, then by all means create a key that is short lived. An expired key acts like a deleted key: you won't be able to sign with it any more, so follow the "What if I lose my key?" flow described above.	+	This guide created an immortal key (see step 2), because //for this use case// [[https://security.stackexchange.com/a/79386/72365\|key expiration does not add any security]] while it increases development friction.
-		+
-	As part of regular security hygiene, consider rotating your keys at least yearly anyway.	+

		+	As part of regular security hygiene, however, consider creating a new key and replacing the old one at GitHub annually.

cvs_related_scripts

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2026/05/14 20:07	current
Line 1:	Line 1:
	+	When migrating from CVS to Subversion the following stuff has to be touched (changed/removed/replaced/...)

	+	* scripts in CVSROOT
	+	* cvsclean script in php-src.
	+	* user management (creation/change password)
	+	* snaps building (source and windows)
	+	* release building (similar to snaps...)
	+	* php.net website creation
	+	* doc creation (pear and php)
	+	* *.php.net website publishing
	+	* tiny stuff like "Fixed in CVS" message in the bug tracker
	+	* lxr.php.net
	+	* daily ChangeLog update

cvs2svnconversion

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2017/09/22 13:28		current
Line 389:		Line 389:
	</code>		</code>

-	Whew. That was going to make for a //very// long options file where it was very easy to make copypasta errors. I needed to add a little Python code. How does one do foreach (array(//blah blah blah//) as $item) { /* etc / } in Python? So I went to my wife Sarah,* who does know Python.	+	Whew. That was going to make for a //very// long options file where it was very easy to make copypasta errors. I needed to add a little Python code. How does one do foreach (array(//blah blah blah//) as $item) { /* etc / } in Python? So I went to a close friend* who does know Python.

	We came up with this rather handy little bit of code:		We came up with this rather handy little bit of code:

cvstosvnmigration

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2008/07/26 16:45		current
Line 1:		Line 1:
	====== CVS to SVN Migration ======		====== CVS to SVN Migration ======

-	This page will collect all information about the CVS2SVN migration of PHP's cvs.php.net repositories.	+	This page will collect all information about the CVS2SVN migration of PHP's cvs.php.net repositories. Subversion currently seems like a very likely candidate as the future core VCS for PHP. The history has actually already been imported and now the main task is to port all the existing CVS dependent infrastructure.
		+
		+	Mailinglist:
		+	- http://news.php.net/svn.migration
		+
		+	IRC channel:
		+	- #php.svn (EFNet)

	Further information:		Further information:

gitfaq-usecases

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2012/04/13 12:53		current
Line 5:		Line 5:
	=== What would be the best way to bring changes in one branch only? ===		=== What would be the best way to bring changes in one branch only? ===

-	== Example ==	+	== Problem ==

	* a fix must be done in 5.3 only branch, so no need to merge it up into 5.4		* a fix must be done in 5.3 only branch, so no need to merge it up into 5.4
Line 26:		Line 26:
	git merge --log --no-ff --strategy=ours PHP-5.3		git merge --log --no-ff --strategy=ours PHP-5.3
	--- //[[dsp@php.net\|dsp]] 2012/04/13 14:50//		--- //[[dsp@php.net\|dsp]] 2012/04/13 14:50//
-	== What's the correct way to deal with merge conflicts when merging upwards? ==	+	=== What's the correct way to deal with merge conflicts when merging upwards? ===

		+	== Problem ==
	Let's say I make a change on 5.3, which includes a NEWS entry. The NEWS entry understandably conflicts when merging upwards to 5.4. How do I merge it correctly so that it doesn't cause problems for the next committer?		Let's say I make a change on 5.3, which includes a NEWS entry. The NEWS entry understandably conflicts when merging upwards to 5.4. How do I merge it correctly so that it doesn't cause problems for the next committer?

	Furthermore, how do I deal with cases where I don't want a NEWS entry on master at all when merging there?		Furthermore, how do I deal with cases where I don't want a NEWS entry on master at all when merging there?
		+
		+	== Solution ==
		+	Try using [[vcs:gitfaq#mandatory_git_settings\|Moving to Git FAQ]].
		+	Another solution would be
		+	git checkout PHP-5.4
		+	git merge --no-commit --no-ff --log PHP-5.3
		+	git show PHP-5.4:NEWS > NEWS # Overview news
		+	git add NEWS
		+	git commit
		+	--- //[[dsp@php.net\|dsp]] 2012/04/13 14:55//

gitfaq

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2021/04/06 08:00		current
Line 282:		Line 282:
	===== Github Pull Requests =====		===== Github Pull Requests =====

-	There is a mailing list called <git-pulls@lists.php.net>. All pull requests created for the [[http://github.com/php\|github.com/php]] user will go to this mailing list.	+	As php-src is now hosted on GitHub, you can either use GitHub's UI to merge pull requests, or merge it locally and push it upstream. If you rebase or squash the commits, you can add "Closes GH-1234" to the description of the commit to auto-close the PR.

-	If you have commit rights to a mirrored PHP repository you can pull the requests and push it to the official repositories.	+	See the pull request related sections of the [[gitworkflow#reviewing_and_closing_pull_requests\|Git Workflow]] document for more information.

-	You cannot use the Merge button on GitHub for that. The PHP Organization on GitHub will not accept contributors. It's only for mirroring!	+	There is also a mailing list called <git-pulls@lists.php.net>. All pull requests created for the [[http://github.com/php\|github.com/php]] user will go to this mailing list. The mailing list is less noisy than watching all pull request activity.
-		+
-	See the pull request related sections of the [[gitworkflow#reviewing_and_closing_pull_requests\|Git Workflow]] document for more information.	+

	===== Commit Mails =====		===== Commit Mails =====

gitworkflow

Anonymous (anonymous@undisclosed.example.com) — 2025-08-06T10:03:07+00:00

2025/04/03 13:08		current
Line 117:		Line 117:

	==== Updating NEWS ====		==== Updating NEWS ====
-	If a patch is related to a bug ticket or is worth it a mention otherwise, the NEWS file needs to be updated to reflect the change done. The NEWS entry has to be added manually in every branch, where the patch is applied. Whereby NEWS in master is being updated only for master only patches. More info is available in the corresponding section in [[http://git.php.net/?p=php-src.git;a=blob;f=README.GIT-RULES;hb=refs/heads/master\|README.GIT-RULES]].	+	If a patch is related to a bug ticket or is worth it a mention otherwise, the NEWS file needs to be updated to reflect the change done. More info is available in [[https://github.com/php/php-src/blob/master/CONTRIBUTING.md#news\|CONTRIBUTING.md]].

	When merging upwards, you can either commit the NEWS entry separately, or as part of the merge commit. To do that, merge using ''git merge PHP-8.2 --no-commit'', add the NEWS entry, add it to the staging area, and ''git merge --continue''.		When merging upwards, you can either commit the NEWS entry separately, or as part of the merge commit. To do that, merge using ''git merge PHP-8.2 --no-commit'', add the NEWS entry, add it to the staging area, and ''git merge --continue''.

https-svn

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2011/06/15 19:58		current
Line 4:		Line 4:

	* Go to the root of your checkout and run		* Go to the root of your checkout and run
-	* //svn info//	+	* ''svn info''
	* Grab the URL part and then run		* Grab the URL part and then run
-	* //svn switch --relocate <url> <url-over-https> .//	+	* ''svn switch -''''-relocate <url> <url-over-https> .''

svnfaq

Anonymous (anonymous@undisclosed.example.com) — 2025-04-03T13:08:43+00:00

2017/09/22 13:28		current
Line 133:		Line 133:
	* You cannot checkout the entire repository on case-insensitive filesystem		* You cannot checkout the entire repository on case-insensitive filesystem
	===== Validating your account =====		===== Validating your account =====
-	To gain access to svn.php.net you have to "validate your SVN account". This is automatically done by logging into master (https://master.php.net/login.php), the wiki (http://wiki.php.net) or reply to bugs on bugsweb (http://bugs.php.net/) from the developer tab.	+	To gain access to svn.php.net you have to "validate your SVN account". This is automatically done by logging into main (https://main.php.net/login.php), the wiki (http://wiki.php.net) or reply to bugs on bugsweb (http://bugs.php.net/) from the developer tab.
	Your access credentials will be synchronized within 15minutes.		Your access credentials will be synchronized within 15minutes.