Re: com php-src: Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret: ext/pdo_firebird/firebird_driver.c
| From: | Ferenc Kovacs | Date: | Thu, 10 Apr 2014 08:06:19 +0000 |
| Subject: | Re: com php-src: Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret: ext/pdo_firebird/firebird_driver.c | ||
| References: | 1 2 3 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-76767@lists.php.net to get a copy of this message | ||
2014.04.10. 9:56, "marius adrian popa" <mapopa@gmail.com> ezt írta:
>
> I will update it , any tips on updating the NEWS file
>
> If i update in php 5.4 for example i get conflicts when merging with 5.5
...
> I wonder why there is no NEWS file for each branch
> NEWS.5.4 ...
Hi,
I've already fixed it.
Yeah working with the NEWS file is a bit PITA.
You should check out our gitfaq/gitworkflow page on wiki.php.net, there is
a git merge driver config option, what everybody should be using for the
php-src repo.
That will cause merges not affecting the NEwS file so one has to manually
edit and commit the changes when merging.
Ps: sorry for the typos, sent from my phone.