Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:76929 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 78716 invoked from network); 28 Aug 2014 20:43:12 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 28 Aug 2014 20:43:12 -0000 Authentication-Results: pb1.pair.com smtp.mail=anatol.php@belski.net; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=anatol.php@belski.net; sender-id=unknown Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error) X-PHP-List-Original-Sender: anatol.php@belski.net X-Host-Fingerprint: 85.214.73.107 klapt.com Received: from [85.214.73.107] ([85.214.73.107:47284] helo=h1123647.serverkompetenz.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 19/50-10032-C549FF35 for ; Thu, 28 Aug 2014 16:43:08 -0400 Received: by h1123647.serverkompetenz.net (Postfix, from userid 33) id 3366B6D209C; Thu, 28 Aug 2014 22:43:04 +0200 (CEST) Received: from 79.251.152.25 (SquirrelMail authenticated user anatol@belski.net) by webmail.klapt.com with HTTP; Thu, 28 Aug 2014 22:43:04 +0200 Message-ID: <57c0e620bd0d6fe8561a05f31e7a7190.squirrel@webmail.klapt.com> In-Reply-To: References: <0011f17934cd6ed1f3ba693597642cb0.squirrel@webmail.klapt.com> Date: Thu, 28 Aug 2014 22:43:04 +0200 To: "Derick Rethans" Cc: "PHP Internals" , "Anatol Belski" User-Agent: SquirrelMail/1.5.2 [SVN] MIME-Version: 1.0 Content-Type: text/plain;charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [PHP-DEV] Merges between PHP5 and PHP7 From: anatol.php@belski.net ("Anatol Belski") Hi Derick, On Thu, August 28, 2014 17:23, Derick Rethans wrote: > 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? > > Since there was just a little interest, I thought it's rather this topic died. Now after working more than a week on master I do share your opinion as well - manual merge is probably the success strategy. The most pain will come from new APIs, just to name some - zend_string vs char*, arrays and changed macro/function signatures. However, once 5 is converted to 7, the pain should decrease. Of course sometimes it'll get complicated, but that's also not the case for automatic. I think also, when we do the further work and see some systematic cases which can be automated, good to know such a mechanism does exist. Regards Anatol