Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:76920
Return-Path: <derick@php.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 50392 invoked from network); 28 Aug 2014 15:23:58 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 28 Aug 2014 15:23:58 -0000
Authentication-Results: pb1.pair.com smtp.mail=derick@php.net; spf=unknown; sender-id=unknown
Authentication-Results: pb1.pair.com header.from=derick@php.net; sender-id=unknown
Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 82.113.146.227 as permitted sender)
X-PHP-List-Original-Sender: derick@php.net
X-Host-Fingerprint: 82.113.146.227 xdebug.org Linux 2.6
Received: from [82.113.146.227] ([82.113.146.227:52868] helo=xdebug.org)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 7D/E3-28393-E894FF35 for <internals@lists.php.net>; Thu, 28 Aug 2014 11:23:58 -0400
Received: from localhost (localhost [IPv6:::1])
	by xdebug.org (Postfix) with ESMTPS id D0A4710CD63;
	Thu, 28 Aug 2014 16:23:54 +0100 (BST)
Date: Thu, 28 Aug 2014 16:23:54 +0100 (BST)
X-X-Sender: derick@whisky.home.derickrethans.nl
To: PHP Internals <internals@lists.php.net>
cc: Anatol Belski <anatol.php@belski.net>
In-Reply-To: <alpine.DEB.2.11.1408221238361.4107@whisky.home.derickrethans.nl>
Message-ID: <alpine.DEB.2.11.1408281623100.20966@whisky.home.derickrethans.nl>
References: <0011f17934cd6ed1f3ba693597642cb0.squirrel@webmail.klapt.com> <alpine.DEB.2.11.1408221238361.4107@whisky.home.derickrethans.nl>
User-Agent: Alpine 2.11 (DEB 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: Re: [PHP-DEV] Merges between PHP5 and PHP7
From: derick@php.net (Derick Rethans)

On Fri, 22 Aug 2014, Derick Rethans 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.

Really, no comments about this at all?

cheers,
Derick