Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:66635
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.219.52 as permitted sender)
MIME-Version: 1.0
Sender: patrick.allaert@gmail.com
Date: Fri, 15 Mar 2013 10:16:54 +0100
Message-ID: <CACwt+JfVU2kXDETQ5ngjaoDg_fXDgbuGh4LW3_Zcv2sdZLKG8A@mail.gmail.com>
To: Dmitry Stogov <dmitry@zend.com>
Cc: Xinchen Hui <laruence@gmail.com>, David Soria Parra <dsp@php.net>, Rasmus Lerdorf <rasmus@lerdorf.com>, 
	Zeev Suraski <zeev@zend.com>, PHP Internals <internals@lists.php.net>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5
From: patrickallaert@php.net (Patrick ALLAERT)

2013/3/15 Dmitry Stogov <dmitry@zend.com>:
> 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