Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66642 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 91064 invoked from network); 15 Mar 2013 10:24:33 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 15 Mar 2013 10:24:33 -0000 Authentication-Results: pb1.pair.com smtp.mail=dmitry@zend.com; spf=unknown; sender-id=unknown Authentication-Results: pb1.pair.com header.from=dmitry@zend.com; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain zend.com does not designate 209.85.212.50 as permitted sender) X-PHP-List-Original-Sender: dmitry@zend.com X-Host-Fingerprint: 209.85.212.50 mail-vb0-f50.google.com Received: from [209.85.212.50] ([209.85.212.50:33771] helo=mail-vb0-f50.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id A6/96-59234-1E6F2415 for ; Fri, 15 Mar 2013 05:24:33 -0500 Received: by mail-vb0-f50.google.com with SMTP id ft2so1790380vbb.9 for ; Fri, 15 Mar 2013 03:24:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type:x-gm-message-state; bh=s2wUzk77kPRgcvmk6jVQMwlvtZcwcq6YO7FA8kHJDfQ=; b=TuFPMYxtu8Yg3UNMTfCUEKRB8qTxxTtfGrBcAr7zPfI11xcIlRXquEO1z+XqHsED10 sN4veev6B5nEHhXSUxc1Q8g2X4si6Z13ZBJvyoLDrLTquZez2wfzQ/RQz+CtGEe654NQ 19nTqBmPhrWcMjfMQ39qtl/fU8F4N+VB1ScVQtzqZwxCRoEOgQ4G2T0K15spyuCA/dar +PZglXmIz4PFVEZFZJpL11z8TdZT/Bu8rbQ0pkZlJA7bukjyEfKhL5CFPLhk3OKsixtV vZo1U2siPp8arzr1+wg2Y/vWidppuu5HGGjlza6JH/uHy8OaRipUluujnPBnyPlWp+G2 TNgQ== MIME-Version: 1.0 X-Received: by 10.58.205.179 with SMTP id lh19mr6195479vec.7.1363343070753; Fri, 15 Mar 2013 03:24:30 -0700 (PDT) Received: by 10.52.115.170 with HTTP; Fri, 15 Mar 2013 03:24:30 -0700 (PDT) In-Reply-To: References: Date: Fri, 15 Mar 2013 14:24:30 +0400 Message-ID: To: Damien Tournoud Cc: Patrick ALLAERT , Xinchen Hui , David Soria Parra , Rasmus Lerdorf , Zeev Suraski , PHP Internals Content-Type: multipart/alternative; boundary=089e011841a0708c6004d7f40bb6 X-Gm-Message-State: ALoCoQkF+fe+88wkUsFX918Y4rjjGqkLyXuXLHpejoue2MUeyOGoAqLAEdIlT2Pw7t86uinV27y+P6WP9j4uaP2R0LADFU19g+UW2nkHnZzmIxytrIW9GdHajXVAArQtFWMMVKlQMdVK Subject: Re: [PHP-DEV] Re: Merging O+ into 5.5 From: dmitry@zend.com (Dmitry Stogov) --089e011841a0708c6004d7f40bb6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable The problem that this approach renames the commits an they are not the same anymore (as in O+ repo). Usage of subtree strategy is not perfect, but it's something that more or less works. Thanks. Dmitry. On Fri, Mar 15, 2013 at 2:19 PM, Damien Tournoud wrote: > On Fri, Mar 15, 2013 at 11:08 AM, Dmitry Stogov wrote: > > This solution clones the history, but makes merging between PHP and O+ > repo > > (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. > =E2=80=A6 and having the history (ie. the common ancestors) should even h= elp the > merge > algorithm. > > Damien > --089e011841a0708c6004d7f40bb6--