Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:29984
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain lerdorf.com from 204.11.219.139 cause and error)
Message-ID: <465E85E6.70304@lerdorf.com>
Date: Thu, 31 May 2007 01:23:02 -0700
User-Agent: Thunderbird 2.0.0.0 (Macintosh/20070326)
MIME-Version: 1.0
To: Pierre <pierre.php@gmail.com>
CC: Andi Gutmans <andi@zend.com>, sniper@iki.fi,
        PHP Internals List <internals@lists.php.net>
References: <4e89b4260705280856t47429e54ofcc182e02a6627e5@mail.gmail.com>	 <001d01c7a27f$6d12bf80$39dc2f52@foxbox> <465D13E4.9050201@lerdorf.com>	 <1237063851.20070530094541@marcus-boerger.de>	 <465D2FB0.5060308@lerdorf.com> <014601c7a293$3e047440$39dc2f52@foxbox>	 <465D35D2.4050001@lerdorf.com>	 <1180530241.3496.13.camel@localhost.localdomain>	 <465D90D3.1090601@lerdorf.com>	 <698DE66518E7CA45812BD18E807866CE418708@us-ex1.zend.net> <fe05d1540705310117y1e1c6bcbn3ceb4ff49c91fa5f@mail.gmail.com>
In-Reply-To: <fe05d1540705310117y1e1c6bcbn3ceb4ff49c91fa5f@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] better changeset tracking
From: rasmus@lerdorf.com (Rasmus Lerdorf)

Pierre wrote:
> Hi,
> 
> On 5/31/07, Andi Gutmans <andi@zend.com> wrote:
> 
>> As we expect many more years for PHP we should make sure that the train
>> we're riding has momentum and can help us continue to scale our dev
>> process. I think SVN is the right train to hop onto.
> 
> I would like to propose Git. I think it is more appropriate for large
> projects like PHP. I do not have the time to provide a full list of
> its advantages or features but here are some of its huge advantages:
> - user tree
> - its ability to push patches from a tree to another
> - CVS bridge (non developers can still checkout/provide patches using cvs)
> 
> For example, it is possible to have (only examples! :): Dmitry working
> on a complete rewrite of the engine,  Stan is fixing TSRM and the QA
> fixing the stable/dev trees. The RMs can still prepare releases in the
> main tree.
> 
> The release manager can then safely choose which patches should be
> pushed. The developers do not have to take care about the release
> process in their trees. Experiments can be done safely in a tree and
> merged (even partially) when they are ready.
> 
> freedesktop has moved to GIT some time ago and for what I heard from
> the developers, it is a huge improvement in their development process.
> The only bad point (which exists with any other migratrion) is the
> time required to learn the new tool.

Which I think is the fatal flaw for a project this large.  Git is also
not very refined.  If you are going to stray that far from the
centralized repository approach then bzr is probably a better bet.

With merge-tracking and cherry picking coming in Subversion you get much
of the same benefits without turning the world upside down.

-Rasmus