Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:58550
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.54 as permitted sender)
Received-SPF: pass (google.com: domain of kris.craig@gmail.com designates 10.216.137.147 as permitted sender) client-ip=10.216.137.147;
MIME-Version: 1.0
In-Reply-To: <slrnjl54vo.mfm.dsp@experimentalworks.net>
References: <slrnjl54vo.mfm.dsp@experimentalworks.net>
Date: Sat, 3 Mar 2012 15:24:01 -0800
Message-ID: <CAKOpQSzFq9ZeJRk43Wj2enF2f0g6gdRxT0d25h=KTsH0V4w9xg@mail.gmail.com>
To: David Soria Parra <dsp@php.net>
Cc: internals@lists.php.net
Content-Type: multipart/alternative; boundary=00504502caea01386e04ba5efd69
Subject: Re: [PHP-DEV] Git Migration: Status Update
From: kris.craig@gmail.com (Kris Craig)

--00504502caea01386e04ba5efd69
Content-Type: text/plain; charset=ISO-8859-1

Thanks for the update!

Quick question:  As far as the branching model goes, are we going to stick
with the SVN-style of just having a branch for each release version and
dumping all the commits directly onto it, or do you plan on switching to a
more modern Git-style branching model of merging feature sub-branches into
the parent version branches?  Or has this issue not been discussed yet?

--Kris


On Sat, Mar 3, 2012 at 1:58 PM, David Soria Parra <dsp@php.net> wrote:

> Hi Internals,
>
> with 5.4. out of the door, we can start thinking about moving
> the php-src repository to git. Commit access to the php-src SVN
> repository will be disabled on March 15. I will run the final
> migration on that date and push the php repository to git.php.net.
>
> Updates:
>
>  (1) Pull requests on github.com go to the git-pull mailinglist.
>     Make sure you subscribe to it.
>
>  (2) Johannes is working on an interface that allows people with
>     valid PHP user accounts to close pull requests.
>
> There are a few issues at the moment that we have to fix before:
>
>  (1) Fix the commit mails to the proposed format. Irker is working on
>     that.
>
>  (2) Fix the bugsweb integration, so that references to bugs inside
>     the commits will work. Florian is working on it.
>
>  (3) Karma system fixes. Already done by me. People who have access to
>     the root of a repository are able to do forced pushes.
>
>  (4) FAQ
>     Please send me questions about workflows, etc. I will try to
>     answer them in the gitfaq to help you out with questions. We need
>     to make sure people know how to commit, where to commit to, etc.
>     I have the workflows in mind, but just not written it down so far.
>     Feel free to help me.
>
> If you are not familiar with git, play with it now. We have a playground
> repository that everybody can use. Go ahead.
>
> I would love to see more and more pull requests coming in or patchs send
> with git format-patch + sendmail. Maintainer can apply those with git am.
> This helps maintainers as well as reducing the amount of new user accounts
> needed. So go ahead, send us patches!
>
> If you now a lot about git, feel free to answer questions on
> http://wiki.php.net/vcs/gitfaq and help out.
>
> If you have no clue about git and how to work on php from March 15 on
> write your questions down on http://wiki.php.net/vcs/gitfaq .
>
> David (@dsp_)
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--00504502caea01386e04ba5efd69--