Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:76926
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.192.51 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.11.1408221238361.4107@whisky.home.derickrethans.nl>
References: <0011f17934cd6ed1f3ba693597642cb0.squirrel@webmail.klapt.com>
	<alpine.DEB.2.11.1408221238361.4107@whisky.home.derickrethans.nl>
Date: Thu, 28 Aug 2014 22:01:47 +0200
Message-ID: <CAEZPtU6-N75nGch0stqESPqUrRA4Qps=jUvE3=PmuQ2s0HXYMQ@mail.gmail.com>
To: Derick Rethans <derick@php.net>
Cc: PHP internals <internals@lists.php.net>, Anatol Belski <anatol.php@belski.net>
Content-Type: multipart/alternative; boundary=001a1134b004b0e8100501b601f2
Subject: Re: [PHP-DEV] Merges between PHP5 and PHP7
From: pierre.php@gmail.com (Pierre Joye)

--001a1134b004b0e8100501b601f2
Content-Type: text/plain; charset=UTF-8

On Aug 22, 2014 1:39 PM, "Derick Rethans" <derick@php.net> wrote:
>
> On Fri, 22 Aug 2014, Anatol Belski wrote:
>
> > as there are many data type changes, here's an idea on how to simplify
> > the merges. Git supports custom merge drivers which attracted my
> > attention, so I've ended up with the following trick:
>
> As there are that many differences, does it still make sense to GIT
> merge PHP 5 changes up to 7 at all? Shouldn't we just do it by hand. I
> would expect that to have a much greater rate of success.

I brought this topic a while back too. The same issue happens for pecl
extensions. The more exts I do the more I think about either using separate
branches or separate source files, respectively separate realeses or common
release for both 5.x and 7.x.

For the core, I have the feeling than manual merges will be far less
painful.

Cheers,
Pierre

--001a1134b004b0e8100501b601f2--