Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:60180
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 44177 invoked from network); 18 Apr 2012 10:41:36 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 18 Apr 2012 10:41:36 -0000
Authentication-Results: pb1.pair.com header.from=johannes@schlueters.de; sender-id=unknown
Authentication-Results: pb1.pair.com smtp.mail=johannes@schlueters.de; spf=permerror; 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:40393] helo=config.schlueters.de)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 0F/A7-03614-E5A9E8F4 for <php-cvs@lists.php.net>; Wed, 18 Apr 2012 06:41:35 -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 131FF60B26;
	Wed, 18 Apr 2012 12:41:32 +0200 (CEST)
To: PHP internals list <internals@lists.php.net>
Cc: php-cvs <php-cvs@lists.php.net>
In-Reply-To: <1334745305.4917.183.camel@guybrush>
References: <1334745305.4917.183.camel@guybrush>
Content-Type: text/plain; charset="UTF-8"
Date: Wed, 18 Apr 2012 12:41:30 +0200
Message-ID: <1334745690.4917.191.camel@guybrush>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Content-Transfer-Encoding: 8bit
Subject: Re: [PHP-DEV] HEADS UP: Force pushed to revert to
 d55afe4df63945a6e3abe9892ba7836f83c74265
From: johannes@schlueters.de (Johannes =?ISO-8859-1?Q?Schl=FCter?=)

On Wed, 2012-04-18 at 12:35 +0200, Johannes Schlüter wrote:
> 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.

I've pushed the "messed" branch to
https://github.com/johannes/php-src/tree/php-5.4-messup in case somebody
wants to verify something.

johannes