Re: Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: main/SAPI.h
| From: | Rasmus Lerdorf | Date: | Sat, 31 Mar 2012 15:40:43 +0000 |
| Subject: | Re: Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: main/SAPI.h | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-59270@lists.php.net to get a copy of this message | ||
On 03/31/2012 01:52 AM, David Soria Parra wrote:
> On 2012-03-31, David Soria Parra <dsp@php.net> wrote:
>> Commit: 3bf53aa911e1e2128a11aee45c126000635de006
>> Author: David Soria Parra <dsp@php.net> Sat, 31 Mar 2012 09:34:25 +0200
>> Parents: aa774a51d5c45b98103e0f67914d4c0b152e80ae
>> ff8be9845f14a8156e7551033c2e98dad459f6fd
>> Branches: PHP-5.4 master
>>
>> Link:
>> http://git.php.net/?p=php-src.git;a=commitdiff;h=3bf53aa911e1e2128a11aee45c126000635de006
>>
>> Log:
>> Merge branch 'PHP-5.3' into PHP-5.4
>>
>> * PHP-5.3:
>> Cleanup Safe Mode related comment in SG(request_info)
>>
>> Changed paths:
>> MM main/SAPI.h
>
> The diff is strange. Git and Gitweb show both that just the comment
> changed. The diff here displays the overall differneces between SAPI.h
> in PHP-5.3 and PHP-5.4 and not what I actually changed.
Right, that's what I have been complaining about as well. The diffs in
emails on merges do not reflect reality. It happens on all merges to
code that is different between 5.3 and 5.4.
-Rasmus