Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66638 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 69034 invoked from network); 15 Mar 2013 09:34:34 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 09:34:34 -0000 Authentication-Results: pb1.pair.com smtp.mail=dmitry@zend.com; spf=unknown; sender-id=unknown Authentication-Results: pb1.pair.com header.from=dmitry@zend.com; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain zend.com does not designate 209.85.212.54 as permitted sender) X-PHP-List-Original-Sender: dmitry@zend.com X-Host-Fingerprint: 209.85.212.54 mail-vb0-f54.google.com Received: from [209.85.212.54] ([209.85.212.54:51234] helo=mail-vb0-f54.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 87/D1-59234-92BE2415 for ; Fri, 15 Mar 2013 04:34:34 -0500 Received: by mail-vb0-f54.google.com with SMTP id l1so1771372vba.27 for ; Fri, 15 Mar 2013 02:34:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type:x-gm-message-state; bh=5TW/km4So3MG2p9vxT+LYYYYWkk9hpYHszcQFyIaaLo=; b=lkYBtqp33mHErcHrm56WuOMVzHFnc01Hbwqi5iZFzKrNfGgQnhgNa/ajuPPbvEl9LW /VgPFuHY6q6wFrBLnYoV7sGgSiEdG7PEjE5aDSON3l/Cj8yeAcutG1rHA9gEC69AyjjN Z7iii0+TZDb8MP/3zgrYTYyrINMxF8yQflPzMicI2sKYdNLH500AJtjmxOR6m1UrwdWQ mQoMSwggBY1Bry9Ioh3j5DQ9Vx6eu/Pd4PcAlgZKFnjDiXTyFVWJUT0809ZhaVjG3EJp T8+3oXNI7tyF2tKlSWM4imDo2SPKfJffMpX5zvrMzBmklC+hNQ1BgxS0PBUQ1WADtNzv sBoA== MIME-Version: 1.0 X-Received: by 10.58.29.101 with SMTP id j5mr6101923veh.26.1363340071212; Fri, 15 Mar 2013 02:34:31 -0700 (PDT) Received: by 10.52.115.170 with HTTP; Fri, 15 Mar 2013 02:34:31 -0700 (PDT) In-Reply-To: References: Date: Fri, 15 Mar 2013 13:34:31 +0400 Message-ID: To: Pierre Joye Cc: Patrick ALLAERT , Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: multipart/alternative; boundary=047d7b676562a72bd504d7f35868 X-Gm-Message-State: ALoCoQmyf+q5ohuVRTizwIblipG5DRovA+g/9fUFY0rZdSjnKxPC4Z6UwVG+Q83wsGQU6CGnL+clME7j54XNtF9Su7uTlO0i33jIux1R0Sd1cOn/NRi0wg63OjpxkB6alJAZCOAgdTDw Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: dmitry@zend.com (Dmitry Stogov) --047d7b676562a72bd504d7f35868 Content-Type: text/plain; charset=UTF-8 Yeah, I'm working in this direction. Agree, it's better to do it before the merging. Thanks. Dmitry. On Fri, Mar 15, 2013 at 1:33 PM, Pierre Joye wrote: > 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 > --047d7b676562a72bd504d7f35868--