Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:70667
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmx.net designates 212.227.15.18 as permitted sender)
Message-ID: <52AF45E0.5020000@gmx.net>
Date: Mon, 16 Dec 2013 10:26:40 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0
MIME-Version: 1.0
To: Stas Malyshev <smalyshev@sugarcrm.com>, Joe Watkins <krakjoe@php.net>, 
 PHP Internals <internals@lists.php.net>,
 David Soria Parra <dsp@php.net>
References: <52AED1CE.6050104@sugarcrm.com> <52AED409.4060104@gmx.net>
In-Reply-To: <52AED409.4060104@gmx.net>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: PHP 5.4 branch?
From: dsoria@gmx.net (David Soria Parra)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

it looks like there is even more mess. I think laruence has
accidentally merged before. I try to clean it up. Stas please verify
that the new version is correct. This will miss out commit
330168a2477666212797095449029e78dcce0844 on PHP-5.4. People should be
more aware of what they are doing. The merges in the repository are a
mess and it's hard to wrap my head around who was merging was on his
local machine from upstream or anything else.

David

On 12/16/2013 02:20 AM, David Soria Parra wrote:
> I've overwritten PHP-5.4 and master. Johannes and me can overwrite
>  branches. If you need to, let me know and I hand out the necessary
>  rights (carefully).
> 
> 
> On 12/16/2013 02:11 AM, Stas Malyshev wrote:
>> Hi!
> 
>> I see that with this commit: 
>> http://git.php.net/?p=php-src.git;a=commit;h=9db649f1a71a3603a6ff9dc6d597a7e28774f16f
>
>>
>> 
You've merged master into PHP 5.4. Why did you do that? This
>> needs to be fixed ASAP (and may require force push rights to do 
>> cleanly, so CCing David too).
> 
> 
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSr0XgAAoJEKSanlo0ToXK7WQP/iASp5JsJuAfeXEyXrqqb3sP
6pIxFq7grUBGkWdKn1vPUGVmN4xvlpE/gjBwKBumFcAGEuDg25L/NAeTtWtUJlb/
KnBllajrKmDKNefSxP9l1G54rO94km5nIYPiS53/XqalMjSbaNA27nDlYPyAyDpt
IF0QsP+S0PaSEq4WwNGYoUCD3y9zPQ5JZ+bdkRqQtRrvbXXceAb0HtAzEMaUArFn
2bHb+VlSOalwu+L0CwrRiFNS3Y2bTMZV8q3cCUHO4C/Qy6JeuOy15szfOtlxqFyj
Pe6jetrP7nOliGOrKWykdTeONxcb261NLWEI6itiKI+KHnq6+jkptHHG8Y9JskJv
JxV/Szvh/Uj7mUi8BFXoxcK2IF6DbSrWQlRDl1+WI0iZkahFC4RjMt94Q3zZ7mhl
B4oo4nFBFY4iaWmGExEd9TpbxOz+5FwuNbMm+4qghqcmqCK4oVyd4+IWl0LNHLqJ
cjfCkX2QuTsvMhQAPesuA+jIgRMosUjgQbTfwg1nca2wH+JIR7XW2L5D0zKPeWT+
bf+6J69jYKzxG6pzv0BgJTgOTOgGW1Kn7a8ZKFavtQFuc69ku4qNZr3c7U00zJ0M
/ewp+MU808jwMIvYaybnovDlEbTFrO+Brx76Ra1nrl5AHBivT6tJalCJGmyUZ9zq
4mGDe5TdWfTXnScBNLQw
=E2iw
-----END PGP SIGNATURE-----