Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66641 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 89499 invoked from network); 15 Mar 2013 10:19:44 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 10:19:44 -0000 Authentication-Results: pb1.pair.com smtp.mail=damz@damz.org; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=damz@damz.org; sender-id=pass Received-SPF: pass (pb1.pair.com: domain damz.org designates 209.85.210.177 as permitted sender) X-PHP-List-Original-Sender: damz@damz.org X-Host-Fingerprint: 209.85.210.177 mail-ia0-f177.google.com Received: from [209.85.210.177] ([209.85.210.177:58018] helo=mail-ia0-f177.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 63/46-59234-FB5F2415 for ; Fri, 15 Mar 2013 05:19:43 -0500 Received: by mail-ia0-f177.google.com with SMTP id y25so3045465iay.22 for ; Fri, 15 Mar 2013 03:19:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=damz.org; s=google; h=mime-version:x-received:x-originating-ip:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=4A97WdE6IbJedANAv19GCve34LtLJL7vEDWBN8B6shE=; b=azRvIjoU67vsbByZhUeE6Z51/5XNXPxy15DoQ8ga8SpJcc6apzIGIXQtrGNWxm7/ct ekrj+sHEua9h2t2DqNMFCccNrdgISi9wqgO6F85fcu80blGXFy8kYz2Xfe5jwKw0SS7I mIwl/jirBVZN0K5E4BpaA/Are6PKDVwqSfgoY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:x-originating-ip:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding:x-gm-message-state; bh=4A97WdE6IbJedANAv19GCve34LtLJL7vEDWBN8B6shE=; b=E+BIzPitFVAReZkdiHQ0ejiMOi7IT4c7MneyQ74rOUNByOBoOCiAfk5Yo6wkiIyaek vW6ytXS/2zu43vXM3YbFw8TZESvtSpFKhovrgM/txyHU2Lg9W3p2ck2P5RVbezrX3a3o 0Za4eyLvZ5bKqzXP8X3RWiRLK5RzqCmW1lIXIYo4RA+ArKUL9wphyZlOPFsr/ukMPtQW gg125nF4uy+iuYvs+RoEKBZtK4DFTXuYHkpVgO0S1zuya8UWeEykdqLA3NPtESWBfoAw y3hRu8C84ojMO+7UcHXW59gPlPYnaHvu5WiqnAUc9BjkH1Q/UZ6fUAPnxJUTkkbjxE6K gFnA== MIME-Version: 1.0 X-Received: by 10.50.17.71 with SMTP id m7mr777427igd.14.1363342780846; Fri, 15 Mar 2013 03:19:40 -0700 (PDT) Received: by 10.50.132.34 with HTTP; Fri, 15 Mar 2013 03:19:40 -0700 (PDT) X-Originating-IP: [92.103.57.251] In-Reply-To: References: Date: Fri, 15 Mar 2013 11:19:40 +0100 Message-ID: To: Dmitry Stogov Cc: Patrick ALLAERT , Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQntAD7cmD1T9LmCB71a+vpxvQzvN1mkT2Ltg7A2Td7wztdnLuXgLmUrhaWK8SSIcsCxYoNJ Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: damz@damz.org (Damien Tournoud) On Fri, Mar 15, 2013 at 11:08 AM, Dmitry Stogov wrote: > This solution clones the history, but makes merging between PHP and O+ re= po > (it's going to be used for pecl build for old PHP versions) even more > difficult. > > Thanks. Dmitry. Not sure. Merging between the two repositories using the subtree strategy should be just fine. =85 and having the history (ie. the common ancestors) should even help the = merge algorithm. Damien