com php-src: UPDATE README.GIT-RULES wrt. PHP-7.3: README.GIT-RULES README.RELEASE_PROCESS
| From: | Christoph Michael Becker | Date: | Tue, 31 Jul 2018 15:06:44 +0000 |
| Subject: | com php-src: UPDATE README.GIT-RULES wrt. PHP-7.3: README.GIT-RULES README.RELEASE_PROCESS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102762@lists.php.net to get a copy of this message | ||
Commit: 7866f28173160f956e0b8352be3827ce33a8be1e
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 31 Jul 2018 17:06:44 +0200
Parents: bccf0dfba1498817ee3ec7d8ef36aff0d11307bc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7866f28173160f956e0b8352be3827ce33a8be1e
Log:
UPDATE README.GIT-RULES wrt. PHP-7.3
We also add a respective note to README.RELEASE_PROCESS, so this won't
get overlooked again.
Changed paths:
M README.GIT-RULES
M README.RELEASE_PROCESS
Diff:
diff --git a/README.GIT-RULES b/README.GIT-RULES
index 1a0c1ae..5f44739 100644
--- a/README.GIT-RULES
+++ b/README.GIT-RULES
@@ -46,6 +46,10 @@ Currently we have the following branches in use::
master The active development branch.
+ PHP-7.3 Is used to release the PHP 7.3.x series. This is a current
+ non stable version and is open for bugfixes and minor improvements
+ only.
+
PHP-7.2 Is used to release the PHP 7.2.x series. This is a current
stable version and is open for bugfixes only.
diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS
index b0fb573..b538589 100644
--- a/README.RELEASE_PROCESS
+++ b/README.RELEASE_PROCESS
@@ -341,6 +341,7 @@ Forking a new release branch
Add a commit on master after the branch point clearing the NEWS, UPGRADING
and UPGRADING.INTERNALS files, updating the version in configure.ac (run
./configure to automatically update main/php_versions.h, too) and Zend/zend.h.
+ Also list the new branch in README.GIT-RULES.
Example: http://git.php.net/?p=php-src.git;a=commit;h=a63c99b
Push the new branch and the commit just added to master.