Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66637 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 67655 invoked from network); 15 Mar 2013 09:33:35 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 09:33:35 -0000 Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.217.176 as permitted sender) X-PHP-List-Original-Sender: pierre.php@gmail.com X-Host-Fingerprint: 209.85.217.176 mail-lb0-f176.google.com Received: from [209.85.217.176] ([209.85.217.176:44535] helo=mail-lb0-f176.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 95/81-59234-EEAE2415 for ; Fri, 15 Mar 2013 04:33:34 -0500 Received: by mail-lb0-f176.google.com with SMTP id s4so2636070lbc.35 for ; Fri, 15 Mar 2013 02:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=JFe8naCftRLQsMmWMYhvJ9sPOuHOOD5aYO8x3Pgp+ek=; b=fsIpLOhFS5KkkMyK1WesxhWn6/XYHG8JOeXvqRpbw54jq1lULrnGZWb/j6NbEnAPLM tXQ3h7i44ikJN0OscRo6AMCHxta2Pk5EfOOGw361Yzgm+xqXS/CSmU0nBBmHUx2s9z2a D9dx+ZVDPNhU/8A4GQlUhCCSNdpEpPlFdzU9lF/kRcHQcRKJYBhEHKyWl4VU9Zla4u9w KGSrFJIGCtopZNcTU1kGl3Dk56xhx/L2UnHSRhHH3e2kWLg6E0LSd6QhMGOixth3N07Y r/ivYBixdqIL9nFvSqXq8s8xCtZRo9n2DxdbQfuR+K9m4H4rx/X+mnbXPoCR7QdUyoRl 9gsg== MIME-Version: 1.0 X-Received: by 10.152.104.80 with SMTP id gc16mr5043088lab.49.1363340010594; Fri, 15 Mar 2013 02:33:30 -0700 (PDT) Received: by 10.112.38.199 with HTTP; Fri, 15 Mar 2013 02:33:30 -0700 (PDT) In-Reply-To: References: Date: Fri, 15 Mar 2013 10:33:30 +0100 Message-ID: To: Dmitry Stogov Cc: Patrick ALLAERT , Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: text/plain; charset=ISO-8859-1 Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: pierre.php@gmail.com (Pierre Joye) On Fri, Mar 15, 2013 at 10:24 AM, Dmitry Stogov wrote: > I mean not "git subtree merge" but "git read-dir --prefix ...". > Actually it imports all the history form O+ repo, but it's recorded with > original patches (e.g. ZendAccelerator.h instead of moved > ext/ZendOptimizerPlus/ZendAccelerator.h), so you can see it running "git > log", but not "git log ext/ZendOptimizerPlus/ZendAccelerator.h". btw, it has to be renamed to opcache, aka ext/opcache. I suppose all ini settings have to be updated as well. Cheers, -- Pierre @pierrejoye