Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59159
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 67.192.241.203 as permitted sender)
Message-ID: <4F6F8862.70500@sugarcrm.com>
Date: Sun, 25 Mar 2012 14:04:34 -0700
Organization: SugarCRM
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2
MIME-Version: 1.0
To: Alexey Shein <confik@gmail.com>
CC: PHP Internals <internals@lists.php.net>
References: <CAAAa2shEWhNfUzah8zSY379doK0qG7mWnLgs8Did9Wh12n_5rg@mail.gmail.com>
In-Reply-To: <CAAAa2shEWhNfUzah8zSY379doK0qG7mWnLgs8Did9Wh12n_5rg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] Adopt GitFlow process
From: smalyshev@sugarcrm.com (Stas Malyshev)

Hi!

> There was a discussion recently on IRC that our current git working
> process is not perfect (especially about keeping one branch-only
> bugfixes) so that's a

One thing with discussions on IRC is that nobody except those present
there can neither participate nor know what was talked about. And since
we have timezone differences and other stuff going on in our lives, that
means, on my estimate, a substantial percentage of the people here
wouldn't know anything about what was discussed. Thus, it would be
useful to explain what exactly is the problem we are talking about.

> If you're not yet familiar what is that, please read
> his wonderful article   http://nvie.com/posts/a-successful-git-branching-model/
> another wonderful article about the gitflow tool
> http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/

This is a nice process, however I'm not sure how it could apply to PHP.
Could you outline what will be done in this case when we have:
1. A bugfix for 5.3
2. A bugfix for 5.4
3. A feature addition for 5.4
4. A release of 5.3.x
5. A release of 5.4.x
6. A release of 5.5 and 5.5.x

Also, what would happen if bugfix/feature is contributed via github pull?

> Personally, I see migration from current setup that way so each
> release branch (PHP-5.3, PHP-5.4 and master) becomes a separate
> repository with adopted gitflow model (although it should be thought
> through more carefully).
> What do you think about that?

I do not think it makes sense to keep the code in separate repos, given
that about 90% of the code is the same. It also will make much harder to
accept outside contribution - I'm not sure how easy would it be to merge
a patch into three repos from one pull req.
-- 
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227