com php-src: Update Git rules: README.GIT-RULES

From: Date: Thu, 14 Aug 2014 15:08:02 +0000
Subject: com php-src: Update Git rules: README.GIT-RULES
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-79863@lists.php.net to get a copy of this message
Commit: 7311087cf06bf9f3d6b5863d9b54272f3d163ba9 Author: Johannes Schlüter <johannes@php.net> Thu, 14 Aug 2014 17:08:02 +0200 Parents: 1355ea60ccc3d2b289e5ec72877adc3a99ef9f78 Branches: PHP-5.3 PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7311087cf06bf9f3d6b5863d9b54272f3d163ba9 Log: Update Git rules Changed paths: M README.GIT-RULES Diff: diff --git a/README.GIT-RULES b/README.GIT-RULES index 6e90aa9..30686af 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -51,9 +51,7 @@ Currently we have the following branches in use:: PHP-5.4 Is used to release the PHP 5.4.x series. This is a current stable version and is open for bugfixes only. - PHP-5.3 Is used to release the PHP 5.3.x series. This is currently - in extended support and open forsecurity fixes only. Triaged - via security@php.net + PHP-5.3 This branch is closed. PHP-5.2 This branch is closed. @@ -63,7 +61,7 @@ Currently we have the following branches in use:: The next few rules are more of a technical nature:: - 1. All changes should first go to the lowest branch (i.e. 5.3) and then + 1. All changes should first go to the lowest branch (i.e. 5.4) and then get merged up to all other branches. If a change is not needed for later branches (i.e. fixes for features which where dropped from later branches) an empty merge should be done.

« previous php.cvs (#79863) next »