Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59043
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CAKOpQSz09W_9iWLAdXbbx6bLBi3B+Vgis-LD_FjBga_rUd1eTQ@mail.gmail.com>
References: <slrnjmeju4.mfm.dsp@experimentalworks.net>
	<CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com>
	<CAKOpQSz09W_9iWLAdXbbx6bLBi3B+Vgis-LD_FjBga_rUd1eTQ@mail.gmail.com>
Date: Mon, 19 Mar 2012 11:39:36 -0700
Message-ID: <CAKOpQSz5JU9rY=jE9wzDG7zCg9UqDY-KuMRr8UfLBbGmF7JPWg@mail.gmail.com>
To: David Soria Parra <dsp@php.net>
Cc: internals@lists.php.net
Content-Type: multipart/alternative; boundary=0016e6d63eba5a873904bb9ce1d1
Subject: Re: [PHP-DEV] php-src is now on git
From: kris.craig@gmail.com (Kris Craig)

--0016e6d63eba5a873904bb9ce1d1
Content-Type: text/plain; charset=ISO-8859-1

Me again,

On Mon, Mar 19, 2012 at 11:34 AM, Kris Craig <kris.craig@gmail.com> wrote:

> Also,
>
>
> On Mon, Mar 19, 2012 at 11:21 AM, Kris Craig <kris.craig@gmail.com> wrote:
>
>> Hey,
>>
>>
>> On Mon, Mar 19, 2012 at 8:24 AM, David Soria Parra <dsp@php.net> wrote:
>>
>>> Hi Internals,
>>>
>>> The initial migration is done and initial testing was successful.
>>>
>>>  http://git.php.net/?p=php-src.git;a=summary
>>>  http://github.com/php/php-src
>>>
>>> Please note that some branches and tags were renamed to make
>>> the repository cleaner.
>>>
>>> Please checkout the repository and play around. I have created
>>> a workflow wiki page at https://wiki.php.net/vcs/gitworkflow.
>>> There is also an FAQ at https://wiki.php.net/vcs/gitfaq.
>>>
>>> If you have questions about the workflow or problems let me know.
>>> General git questions should be asked in the appropriate IRC channels
>>> and mailinglists.
>>>
>>> David
>>>
>>> --
>>> PHP Internals - PHP Runtime Development Mailing List
>>> To unsubscribe, visit: http://www.php.net/unsub.php
>>>
>>>
>> Could we modify the workflow to recommend using the "--no-ff" switch when
>> merging in a feature branch?  This is by and large the recommended approach
>> as it preserves the feature branch's commit history, making it *much*easier to sort through complex features that contain numerous commits.
>>
>> --Kris
>>
>>
> I noticed that the workflow page recommends using the SSH URL for
> cloning.  However, isn't that one much more limited access?  I.e. for
> myself at least, it just prompts for a password (presumably for the SSH
> "git" user) which of course I don't have.  Is there a reason why that's
> recommended or is it just a typo?  If the latter, I'd be inclined to change
> it to the SSL (i.e. https) URL (which the FAQ recommends for clone/push and
> utilizes php.net credentials) to minimize confusion.
>
> --Kris
>
>
Also on the workflow page, it shouldn't be necessary to do "git checkout -b
PHP-5.3 origin/PHP-5.3" if the local repo is already tracking from remote
(which it is if you did a git clone to set it up).  Instead, you can simply
do "git checkout PHP-5.3" and it will automatically track from the remote
branch and pull the necessary data to create a local working copy.

Any objections to me changing that?  The less confusing we can make it,
particularly for people who are already struggling with the SVN
withdrawals, the better IMHO.  =)

--Kris

--0016e6d63eba5a873904bb9ce1d1--