[BACK]Return to README.GIT-RULES CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php

Diff for /embedaddon/php/README.GIT-RULES between versions 1.1 and 1.1.1.3

version 1.1, 2013/07/22 01:31:37 version 1.1.1.3, 2014/06/15 20:03:41
Line 45  Currently we have the following branches in use:: Line 45  Currently we have the following branches in use::
   
   master    The active development branch.     master    The active development branch. 
   
  PHP-5.4   Is used to release the PHP 5.4.x series. It still allows for  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
            larger enhancements.            stable version and is open for bugfixes only.
   
  PHP-5.3   Is used to release the PHP 5.3.x series. This is current   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.              stable version and is open for bugfixes only.
   
  PHP-5.2   Is used to release the PHP 5.2.x series. It is closed for   PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
            changes now.            in extended support and open forsecurity fixes only. Triaged
             via security@php.net
   
     PHP-5.2   This branch is closed.
   
   PHP-5.1   This branch is closed.    PHP-5.1   This branch is closed.
   
   PHP-4.4   This branch is closed.    PHP-4.4   This branch is closed.
Line 66  The next few rules are more of a technical nature:: Line 69  The next few rules are more of a technical nature::
       branches) an empty merge should be done.        branches) an empty merge should be done.
   
    2. All news updates intended for public viewing, such as new features,     2. All news updates intended for public viewing, such as new features,
      bug fixes, improvements, etc., should go into the NEWS file of the      bug fixes, improvements, etc., should go into the NEWS file of *any
      *first* to be released version with the given change. In other words      stable release* version with the given change. In other words,
      any NEWS file change only needs to done in one branch.      news about a bug fix which went into PHP-5.4, PHP-5.5 and master
       should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
       not master, which is not a public released version yet.
   
    3. Do not commit multiple file and dump all messages in one commit. If you     3. Do not commit multiple file and dump all messages in one commit. If you
       modified several unrelated files, commit each group separately and        modified several unrelated files, commit each group separately and
Removed from v.1.1  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>