[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: [ci skip] Clarify difference between security & regular bugfixes: README.GIT-
From:       Stanislav Malyshev <stas () php ! net>
Date:       2018-07-31 19:43:22
Message-ID: php-mail-a4806575d86d259d4c1d8e1e094f39bd1761690369 () git ! php ! net
[Download RAW message or body]

Commit:    201022c34791318034f37591d00a39fc00577654
Author:    Stanislav Malyshev <stas@php.net>         Tue, 31 Jul 2018 12:43:22 -0700
Parents:   f8357f9e80773e2922b75cb8a9dc31bd139341af
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=201022c34791318034f37591d00a39fc00577654

Log:
[ci skip] Clarify difference between security & regular bugfixes

Changed paths:
  M  README.GIT-RULES


Diff:
diff --git a/README.GIT-RULES b/README.GIT-RULES
index 5f44739..591b56b 100644
--- a/README.GIT-RULES
+++ b/README.GIT-RULES
@@ -79,10 +79,11 @@ 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.6) and then
-      get merged up to all other branches. If a change is not needed for
-      later branches (i.e. fixes for features which were dropped from later
-      branches) an empty merge should be done.
+   1. All non-security bugfix changes should first go to the lowest bugfix 
+      branch (i.e. 7.1) and then get merged up to all other branches. 
+	  All security fixes should go to the lowest security fixes branch (i.e 5.6).
+      If a change is not needed for ater branches (i.e. fixes for features 
+      which were dropped from later branches) an empty merge should be done.
 
    2. All news updates intended for public viewing, such as new features,
       bug fixes, improvements, etc., should go into the NEWS file of *any


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]