Newsgroups: php.cvs,php.internals
Path: news.php.net
Xref: news.php.net php.cvs:68813 php.internals:60178
Return-Path: <johannes@schlueters.de>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 41258 invoked from network); 18 Apr 2012 10:35:12 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 18 Apr 2012 10:35:12 -0000
Authentication-Results: pb1.pair.com smtp.mail=johannes@schlueters.de; spf=permerror; sender-id=unknown
Authentication-Results: pb1.pair.com header.from=johannes@schlueters.de; sender-id=unknown
Received-SPF: error (pb1.pair.com: domain schlueters.de from 217.114.211.66 cause and error)
X-PHP-List-Original-Sender: johannes@schlueters.de
X-Host-Fingerprint: 217.114.211.66 config.schlueters.de  
Received: from [217.114.211.66] ([217.114.211.66:42229] helo=config.schlueters.de)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 52/07-03614-DD89E8F4 for <php-cvs@lists.php.net>; Wed, 18 Apr 2012 06:35:11 -0400
Received: from [192.168.2.230] (unknown [188.174.209.250])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client did not present a certificate)
	by config.schlueters.de (Postfix) with ESMTPSA id 6BE6B60B1F;
	Wed, 18 Apr 2012 12:35:06 +0200 (CEST)
To: PHP internals list <internals@lists.php.net>, php-cvs
 <php-cvs@lists.php.net>
Content-Type: text/plain; charset="UTF-8"
Date: Wed, 18 Apr 2012 12:35:05 +0200
Message-ID: <1334745305.4917.183.camel@guybrush>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Content-Transfer-Encoding: 8bit
Subject: HEADS UP: Force pushed to revert to
 d55afe4df63945a6e3abe9892ba7836f83c74265
From: johannes@schlueters.de (Johannes =?ISO-8859-1?Q?Schl=FCter?=)

Hi,

the master branch was accidentally merged into the 5.4 branch. I
reverted that by force pushing the old revision
d55afe4df63945a6e3abe9892ba7836f83c74265 into PHP-5.4 and then
cherry-picking all revisions since then. Please take a look and
double-check that nothing was lost.

If you pulled within the last few minutes please make sure that you do
not have the revision 885e57517ad6057b497b2c90482ddb2d58ac1a2b and don't
push that revision to the repository.

johannes


Changes reapplied:

commit 0618e33b5dbac73efc0893884051b5c24e7ab409
Merge: d6394e6 da6465a
Author: Johannes Schlüter <johannes@php.net>
Date:   Wed Apr 18 12:22:27 2012 +0200

    Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
    
    * 'PHP-5.4' of git.php.net:/php-src:
      Fixed bug #61761 ('Overriding' a private static method with a
different signature causes crash)

commit d6394e66a31e788560e664d6823d30b2e759d7cb
Author: Yasuo Ohgaki <yohgaki@ohgaki.net>
Date:   Tue Apr 17 16:34:47 2012 +0900

    Add NEWS

commit cce0f8e507c05ecc7c8222efa5005991f04ce4c0
Author: Yasuo Ohgaki <yohgaki@ohgaki.net>
Date:   Fri Mar 30 09:45:33 2012 +0900

    Implement Request #47570    libpq's PG_VERSION should be exported to
userland

commit da6465a268d9ece2ffd38447890b206dd94b3250
Author: Xinchen Hui <laruence@php.net>
Date:   Wed Apr 18 18:13:27 2012 +0800

    Fixed bug #61761 ('Overriding' a private static method with a
different signature causes crash)

commit d55afe4df63945a6e3abe9892ba7836f83c74265
Merge: 3d106ae f3d86b3
Author: Anatoliy Belsky <ab@php.net>
Date:   Mon Apr 16 17:07:33 2012 +0200

    Merge branch 'PHP-5.3' into PHP-5.4
    
    * PHP-5.3:
      Fix bug 61746 Failing tests in
ext/standard/tests/file/windows_links/*