Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:54474 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 80161 invoked from network); 8 Aug 2011 16:36:03 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 8 Aug 2011 16:36:03 -0000 Authentication-Results: pb1.pair.com smtp.mail=johannes@schlueters.de; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=johannes@schlueters.de; sender-id=unknown Received-SPF: error (pb1.pair.com: domain schlueters.de from 217.114.211.66 cause and error) X-PHP-List-Original-Sender: johannes@schlueters.de X-Host-Fingerprint: 217.114.211.66 config.schlueters.de Received: from [217.114.211.66] ([217.114.211.66:48557] helo=config.schlueters.de) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 5D/E4-53378-170104E4 for ; Mon, 08 Aug 2011 12:36:02 -0400 Received: from [192.168.2.230] (ppp-93-104-62-49.dynamic.mnet-online.de [93.104.62.49]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by config.schlueters.de (Postfix) with ESMTPSA id 55CF277B7F; Mon, 8 Aug 2011 18:35:58 +0200 (CEST) To: David Soria Parra Cc: internals@lists.php.net In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Date: Mon, 08 Aug 2011 18:34:57 +0200 Message-ID: <1312821297.1485.171.camel@guybrush> Mime-Version: 1.0 X-Mailer: Evolution 2.30.2 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] [RFC] Choosing a distributed version control system for PHP (or not). Call for Participation. From: johannes@schlueters.de (Johannes =?ISO-8859-1?Q?Schl=FCter?=) On Sun, 2011-08-07 at 16:50 -0400, David Soria Parra wrote: > I was asked to put together a RFC, and so here we are. I've created > an initial draft. It is mostly based on the very good Python PEP-0374. > It compares Git and Mercurial. > > https://wiki.php.net/rfc/dvcs Two comments: * It is said that the preferred way to get a patch from one branch to another is by doing a merge operation in the VCS. Depending on the timing we will most likely end up with two (trunk + 5.4) or, more likely, three (+ 5.3) old branches which are active. Will it be possible to merge between them using the VCS's merge facilities or will we end up cherry-picking there? If this is possible and we continuously merge these branches what are the strategies for preventing specific changes from being merged with the suggested systems (git and hg)? * There is a section "Moving extension from/to core to/from pecl" which seems to describe the "to core from pecl" route, not the other way round. johannes