Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:79805 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 1252 invoked from network); 18 Dec 2014 11:53:49 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 18 Dec 2014 11:53:49 -0000 Authentication-Results: pb1.pair.com header.from=tyra3l@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=tyra3l@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.42 as permitted sender) X-PHP-List-Original-Sender: tyra3l@gmail.com X-Host-Fingerprint: 74.125.82.42 mail-wg0-f42.google.com Received: from [74.125.82.42] ([74.125.82.42:33586] helo=mail-wg0-f42.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 6B/F1-21720-C40C2945 for ; Thu, 18 Dec 2014 06:53:48 -0500 Received: by mail-wg0-f42.google.com with SMTP id k14so1407797wgh.1 for ; Thu, 18 Dec 2014 03:53:45 -0800 (PST) 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=FSc+YMhR2vD1kq2sZY3f6qVyXND4GsxDvkv+K67mSQo=; b=o91MAnyTug5wPLf5uXIp6I5KndFrTL2gr7bxBsJM4MDtRQDMjR1Gofm2OkM7iQTE+Q FjHRoUHGM5SvujKy3tb1aMa8VJZUPVwhkorYyW7SodixJr9t1Cdn5RZI4jP2STg24/eQ +pFPFf5BpPDbgfq8Ib0TaQelh8KiXZcvcyKiFbDyITJtlTJrnNtzrYAx/AdofLbjAv+h uCJFvV27iMNGyBRpJF0kU5Pu40SHo1YbB47R/BKx8hxZp4QaQXDNlI9C2OvDqSZhSEjk W6Tlec6uky/F7cXQ4qPXdXYuwDHdF+qqiYugTrQEzxthC29j6RbZDmXuSNRosASDMNfE 1pYw== MIME-Version: 1.0 X-Received: by 10.194.88.131 with SMTP id bg3mr3337395wjb.99.1418903625254; Thu, 18 Dec 2014 03:53:45 -0800 (PST) Received: by 10.180.88.33 with HTTP; Thu, 18 Dec 2014 03:53:45 -0800 (PST) In-Reply-To: References: Date: Thu, 18 Dec 2014 12:53:45 +0100 Message-ID: To: Anatol Belski Cc: PHP Internals Content-Type: multipart/alternative; boundary=089e010d849e8dce6c050a7c3e14 Subject: Re: [PHP-DEV] Merging PHP5/PHP7 From: tyra3l@gmail.com (Ferenc Kovacs) --089e010d849e8dce6c050a7c3e14 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, Dec 18, 2014 at 10:25 AM, Anatol Belski wrote: > > Hi, > > the native-tls branch was just merged into master. As all the TSRMLS_* > occurrences was removed, some more merge conflicts are to expect when it > comes from PHP5 to PHP7. I would like to suggest a merge strategy to > minimize the negative effects. Also this will be useful to port the > existing patches and extensions. > > Here is a tool https://gist.github.com/weltling/8e8e0965bc471d254acc I > used to remove the TSRMLS_. Generally there are two cases: > > 1. merging from PHP5 and there is no conflict, then > - just run remove_tsrmls.php on the php-src and commit if needed > > 2. merging from PHP5 and there is a conflict, then > - while in conflicted state, run remove_tsrmls.php > - resolve conflicts and commit > > For the case 2. - removing the tsrmls in the conflicted state usualy > allows a better sight on what is happening, IMHO. Of course, one could > merge with TSRMLS_ first and remove it afterwards. > > Please also see the UPGRADING.INTERNALS section and the RFC for some > details. > > Regards > > Anatol > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > > thanks! --=20 Ferenc Kov=C3=A1cs @Tyr43l - http://tyrael.hu --089e010d849e8dce6c050a7c3e14--