Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:76921
Return-Path: <arvids.godjuks@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 52087 invoked from network); 28 Aug 2014 15:30:33 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 28 Aug 2014 15:30:33 -0000
Authentication-Results: pb1.pair.com smtp.mail=arvids.godjuks@gmail.com; spf=pass; sender-id=pass
Authentication-Results: pb1.pair.com header.from=arvids.godjuks@gmail.com; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.192.44 as permitted sender)
X-PHP-List-Original-Sender: arvids.godjuks@gmail.com
X-Host-Fingerprint: 209.85.192.44 mail-qg0-f44.google.com  
Received: from [209.85.192.44] ([209.85.192.44:60298] helo=mail-qg0-f44.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 86/44-28393-71B4FF35 for <internals@lists.php.net>; Thu, 28 Aug 2014 11:30:33 -0400
Received: by mail-qg0-f44.google.com with SMTP id j5so920659qga.3
        for <internals@lists.php.net>; Thu, 28 Aug 2014 08:30:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :cc:content-type;
        bh=C06LAvCYNTDII/dwwkQozipOJdtb2ufL8lCLsMj6InA=;
        b=y600M66jPexe8h2GfoNJTFhS0FGPHap0ckkJdC4/Wc5tkIWlFZYnEq6Ku5U4xcKxCh
         xz/yINknWr6dRJaZBS7GcDHxaw5t6iE2FUqO0NURIXtY/OUVAQzZ0PrTHZ8q0I0Sun+C
         WpblttzL4um5rHsSj0Qrn1EbhCsxRUMf0l2tJENCZfKbh0YUFp7PAemFgApW0O8pjC/1
         TksOCN8WtBPQ/UCL7t034iR6viI39MN9Uij91F2I47K0I6bD7hqjOjBJ9f4LpW61OtZj
         BA/HDjpyWCsxUGo0pp0aoU5QWaZ9xZUuV6AoQf+Yc1/1gelOEg9ssvaDdHPjwc8OS5Oo
         x3Iw==
MIME-Version: 1.0
X-Received: by 10.140.101.142 with SMTP id u14mr7233508qge.48.1409239828714;
 Thu, 28 Aug 2014 08:30:28 -0700 (PDT)
Received: by 10.140.19.83 with HTTP; Thu, 28 Aug 2014 08:30:28 -0700 (PDT)
Received: by 10.140.19.83 with HTTP; Thu, 28 Aug 2014 08:30:28 -0700 (PDT)
In-Reply-To: <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>
	<alpine.DEB.2.11.1408281623100.20966@whisky.home.derickrethans.nl>
Date: Thu, 28 Aug 2014 18:30:28 +0300
Message-ID: <CAL0xaBEKe1oY-4gfV5fN4Om5OOZ4xjUX+2u7ijiZqC8irB7BvA@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=001a11c1608664dbe40501b23764
Subject: Re: [PHP-DEV] Merges between PHP5 and PHP7
From: arvids.godjuks@gmail.com (Arvids Godjuks)

--001a11c1608664dbe40501b23764
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Just implement and show it working, then i'd say the guys will react.
28 =D0=B0=D0=B2=D0=B3. 2014 =D0=B3. 18:24 =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=
=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C "Derick Rethans" <derick@php.net>
=D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB:

> 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
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--001a11c1608664dbe40501b23764--