Re: Re: Merging O+ into 5.5
| From: | Dmitry Stogov | Date: | Fri, 15 Mar 2013 10:24:30 +0000 |
| Subject: | Re: Re: Merging O+ into 5.5 | ||
| References: | 1 2 3 4 5 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-66642@lists.php.net to get a copy of this message | ||
The problem that this approach renames the commits an they are not the same
anymore (as in O+ repo).
Usage of subtree strategy is not perfect, but it's something that more or
less works.
Thanks. Dmitry.
On Fri, Mar 15, 2013 at 2:19 PM, Damien Tournoud <damz@damz.org> wrote:
> On Fri, Mar 15, 2013 at 11:08 AM, Dmitry Stogov <dmitry@zend.com> wrote:
> > 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.
>
> Not sure. Merging between the two repositories using the subtree
> strategy should be just fine.
> … and having the history (ie. the common ancestors) should even help the
> merge
> algorithm.
>
> Damien
>