Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66640 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 85292 invoked from network); 15 Mar 2013 10:08:23 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 10:08:23 -0000 Authentication-Results: pb1.pair.com header.from=dmitry@zend.com; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=dmitry@zend.com; spf=unknown; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain zend.com does not designate 209.85.212.42 as permitted sender) X-PHP-List-Original-Sender: dmitry@zend.com X-Host-Fingerprint: 209.85.212.42 mail-vb0-f42.google.com Received: from [209.85.212.42] ([209.85.212.42:56089] helo=mail-vb0-f42.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 71/65-59234-613F2415 for ; Fri, 15 Mar 2013 05:08:22 -0500 Received: by mail-vb0-f42.google.com with SMTP id ff1so1803637vbb.29 for ; Fri, 15 Mar 2013 03:08:19 -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=sxDaZLGbscPmSprmBzGYC4S0sT0dIjgHlGzuMIgTwtY=; b=fK+mH/2y8EqaDHDvwl5hY3WbcZApiU2nAwRiz8uuWrcbLiHCYP0wgaSISUfCpolVUU IDB0jBHfer5zk+S1yBkhc9klR6b1b6w5ve8x9DYiZI1IbTqHey3w5LTk0OTIf1sZBDMm j5UAgtEK5vXTRG8znBZuMhwmS2/KkpMVjGb4uOJSHHc4QzBV3BevSAhvxz0Is+tAXl0A QcvDq8kDbFfTIjV/GE/NW6vw/bKIgcvc/JWEFoAuz7UpIPQr6BgN9up1ZS3W9YllYPg5 +IQTFjx4j4BrzdAZsFNsj8BjhZo9SswRdzl4tJe24MpJQD+0c8WkwkzhRroNOKFZd6vw zWCQ== MIME-Version: 1.0 X-Received: by 10.58.233.210 with SMTP id ty18mr6157360vec.46.1363342099629; Fri, 15 Mar 2013 03:08:19 -0700 (PDT) Received: by 10.52.115.170 with HTTP; Fri, 15 Mar 2013 03:08:19 -0700 (PDT) In-Reply-To: References: Date: Fri, 15 Mar 2013 14:08:19 +0400 Message-ID: To: Damien Tournoud Cc: Patrick ALLAERT , Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: multipart/alternative; boundary=089e0102ee7c8e5c5704d7f3d193 X-Gm-Message-State: ALoCoQnllwFGKwliYdV8NkSU392x469WrgnvduTLZ/uK6lSKdcbvDQ/nGPDHwW/mI9rmq9m/XW5T4tp7DcY+szPaB8YXlMuRwMGmkCqa15D7QfoGM9I+0BGZYf6+9DnR1U3XTEQZ4WBt Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: dmitry@zend.com (Dmitry Stogov) --089e0102ee7c8e5c5704d7f3d193 Content-Type: text/plain; charset=UTF-8 This solution clones the history, but makes merging between PHP and O+ repo (it's going to be used for pecl build for old PHP versions) even more difficult. Thanks. Dmitry. On Fri, Mar 15, 2013 at 1:53 PM, Damien Tournoud 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". > > Here you are: > > $ git clone git://github.com/zend-dev/ZendOptimizerPlus.git > $ git clone git://github.com/php/php-src.git > $ cd php-src > $ git remote add opcode ../ZendOptimizerPlus > $ git checkout -b opcode opcode/master > $ git filter-branch -f --index-filter 'git read-tree --empty ; git > read-tree --prefix=ext/opcode "$GIT_COMMIT"' HEAD > $ git checkout -b master origin/master > $ git merge opcode > > Damien > --089e0102ee7c8e5c5704d7f3d193--