RE: [PHP-DEV] Request for php-src karma
| From: | Anatol Belski | Date: | Thu, 11 Jun 2015 12:01:56 +0000 |
| Subject: | RE: [PHP-DEV] Request for php-src karma | ||
| References: | 1 2 3 4 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-86596@lists.php.net to get a copy of this message | ||
Hi Christoph,
> -----Original Message-----
> From: Christoph Becker [mailto:cmbecker69@gmx.de]
> Sent: Thursday, June 11, 2015 1:03 PM
> To: Anatol Belski; internals@lists.php.net
> Subject: Re: [PHP-DEV] Request for php-src karma
>
> Anatol Belski wrote:
>
> > Christoph, please don't forget to note the changes in the NEWS and/or
> > UPGRADING where appropriate. Also don't forget to check the lower
> > branches where your fixes could be profitable.
>
> Thanks for the hints. As I understand it, I should inform the release managers
> about changes in the respective branches.[1][2] What is the best way to do so?
>
> [1] <https://wiki.php.net/vcs/gitworkflow?s[]=release&s[]=manager‚â®
> öy¥gð¾fæGÝÄø>
> [2] <https://bugs.php.net/bug.php?id=68812#1433889583>
> (stas' comment)
>
Please note also that there is a number of README files in the php-src dir, like this one http://git.php.net/?p=php-src.git;a=blob;f=README.GIT-RULES
. In general, if you fix a bug and it's worth it to mention, you just push a patch and add note
into the NEWS. If in doubt, better to ask the RM whether the patch is ok for that particular branch,
of course.
Pushing to the 5.4 branch is another story as only security fixes go in there, so it has to be
cleared out explicitly. The same will apply to any other branch in security mode later, fe 5.5 which
active development period ends soon. Also as far as I see, the patch from the ticket you link was
not merged up as in accordance to the git workflow.
The NEWS file has to be updated in all the active branches but master, usually. Otherwise, if a fix
in master only - so only NEWS in master. As we now have no explicit PHP-7.0 branch, NEWS should be
updated in master as well until PHP-5.4 is EOL.
Regards
Anatol