Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:50542
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Date: Thu, 25 Nov 2010 11:54:55 -0500
Message-ID: <83.53.16484.FD49EEC4@pb1.pair.com>
To: internals@lists.php.net
References: <AANLkTinnOnk2FuxdriyksW4zGGCmauWP7XLBqkTVLMgU@mail.gmail.com>
 <8757232E56758B42B2EE4F9D2CA019C9142FBC@US-EX2.zend.net>
User-Agent: slrn/pre1.0.0-18 (Linux)
Subject: Re: [PHP-DEV] git anyone?
From: weierophinney@php.net (Matthew Weier O'Phinney)

On 2010-11-25, Andi Gutmans <andi@zend.com> wrote:
> > -----Original Message-----
> > From: Pierre Joye [mailto:pierre.php@gmail.com]
> > Sent: Wednesday, November 24, 2010 5:47 PM
> > To: PHP internals
> > Subject: [PHP-DEV] git anyone?
> > 
> > We have moved not too long ago and for what I see it gave some opportunities
> > to many of us to see what are the other tools on the market, git and github in
> > particular. I think 99% of the active developers here are on github or use git in
> > one way or another.
> > 
> > I think git could be a great help, maintaining multiple branches will be easier. It
> > will also be very useful to develop new complex features requiring a longer
> > development period. SVN works fine but merging is very limited and buggy,
> > maintaining a branch while syncing changes from trunk/other branches is a
> > very frustrating experiences.
> > 
> > Please not I'm not requesting to do it now and here, only trying to get a
> > feeling/poll about git usage.
>
> I personally doubt moving will have a material positive impact on the
> project. I wouldn't particularly mind if all the issues were addressed
> but I wouldn't hold my breath that it will be game changing. It may be
> better to invest the effort elsewhere.

I disagree here, actually. It's much easier to handle feature isolation
using git, as you can do these in separate branches -- perhaps not even
on the canonical repo! -- and later merge them in when they are ready.
Additionally, keeping multiple branches up-to-date is much, much
simpler. With ZF, I've found that merging in even months worth of
changes from the ZF1 trunk to ZF2 master is often a matter of hours;
with SVN, this process was so daunting, we simply wouldn't do it in
favor of creating new branches and starting over.

-- 
Matthew Weier O'Phinney
Project Lead            | matthew@zend.com
Zend Framework          | http://framework.zend.com/
PGP key: http://framework.zend.com/zf-matthew-pgp-key.asc