Re: [RFC] Choosing a distributed version control system for PHP (or not). Call for Participation.
| From: | Johannes Schlüter | Date: | Mon, 08 Aug 2011 16:34:57 +0000 |
| Subject: | Re: [RFC] Choosing a distributed version control system for PHP (or not). Call for Participation. | ||
| References: | 1 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-54474@lists.php.net to get a copy of this message | ||
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