Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66636 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 65886 invoked from network); 15 Mar 2013 09:24:41 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 09:24:41 -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.220.172 as permitted sender) X-PHP-List-Original-Sender: dmitry@zend.com X-Host-Fingerprint: 209.85.220.172 mail-vc0-f172.google.com Received: from [209.85.220.172] ([209.85.220.172:50337] helo=mail-vc0-f172.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id BC/21-59234-7D8E2415 for ; Fri, 15 Mar 2013 04:24:40 -0500 Received: by mail-vc0-f172.google.com with SMTP id hr11so1073516vcb.17 for ; Fri, 15 Mar 2013 02:24:36 -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=nt9cOyMEuRnfAHk9KcINDK2li710jcdRvpx0Fe4hf1A=; b=DmB7ncKrfvBzclcbM7judwYQ+saQFFOq89ngoqPzbp033DSXa5SZlvITwbLmIhv1yz QjLfbUI6t/xxVrG/i1rdzZLGIvxhJCfUnUP9zxfQSjyjMSvok7nFDSasovxu+dwVaaK0 Q4wGkhDYoaSguWbCfKb+sfv4FTbuqvi3yHQbg2Wj+5HYM7voLbmcDTHNi7PF1PvgULG3 +qJ+LsixLe0+AHNKCjXxDmoZU0XxrWAQDVaHqVGPoOnNqOmj0lo2WT+W/msCi6hz+ZhJ QJKn/cwVphx+J0ruoBa8jJ6FpePhh07NZvSVfACFlvEltpykn/zrCOuLhHiMKaT/VdWv V/Yw== MIME-Version: 1.0 X-Received: by 10.58.205.179 with SMTP id lh19mr5987452vec.7.1363339476796; Fri, 15 Mar 2013 02:24:36 -0700 (PDT) Received: by 10.52.115.170 with HTTP; Fri, 15 Mar 2013 02:24:36 -0700 (PDT) In-Reply-To: References: Date: Fri, 15 Mar 2013 13:24:36 +0400 Message-ID: To: Patrick ALLAERT Cc: Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: multipart/alternative; boundary=089e011841a0391f9e04d7f33549 X-Gm-Message-State: ALoCoQnKCLqwG18vDYXPfG1Q3zhKFjo9c3b7ATJz4fFDsBcRrGaABQ1ICRvxiVN+lwvBUZb2oiUnbq7x8brRer8uXQHnhumhSLz5IJ3W5NsPQ04eU5UEowLWx0ALldvGy6yXp4/KKIgV Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: dmitry@zend.com (Dmitry Stogov) --089e011841a0391f9e04d7f33549 Content-Type: text/plain; charset=UTF-8 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". Thanks. Dmitry. On Fri, Mar 15, 2013 at 1:16 PM, Patrick ALLAERT wrote: > 2013/3/15 Dmitry Stogov : > > Hi, > > > > For now, I'm trying subtree merging (See > http://git-scm.com/book/ch6-7.htmland > > > https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html > > ) > > > > You may see the result at > https://github.com/dstogov/php-src/tree/PHP-5.5/ > > > > This is not an ideal solution: > > - "git log" doesn't show full history on O+ files (however it's stored in > > GIT) > > - merging from PHP to existing O+ git repo (for pecl release) is not > > trivial. > > > > Anyway I'm going to merge O+ into PHP-5.5 today. > > Using "git subtree merge" you will definitely loose log, however, ZO+ > hasn't been pushed to github with its full history anyway, which is a > bit sad. > You should use a merge technique that relies on "git filter-branch" if > you want to keep the history. > > Patrick > --089e011841a0391f9e04d7f33549--