Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59073
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain oracle.com from 141.146.126.227 cause and error)
Message-ID: <4F67BDF2.8060308@oracle.com>
Date: Mon, 19 Mar 2012 16:14:58 -0700
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20120129 Thunderbird/10.0
MIME-Version: 1.0
To: internals@lists.php.net
References: <slrnjmeju4.mfm.dsp@experimentalworks.net> <CAKOpQSyLSXJU77T03ayj1zw7MeBhom_V58NO8PFu+R_KpH_GvQ@mail.gmail.com> <CAJWj5+EWWV6g3aFOVF+Or99yijJu5Uo-Bt2ObNZ7Fs6UWv3zLg@mail.gmail.com> <CAKOpQSy1eeWDgTCnD7bRvr_+icsj1ExEhuiHvogNsshaB6u3sg@mail.gmail.com> <CAJWj5+GqrCdW0tuVZsQ=GW2n+eV1Q69M_o8h3NOMahGhiwGHmw@mail.gmail.com> <CAKOpQSweGeOy8vaMaRGc75ia=uC6YRLcZ3YkxKMDL9ZXxubbug@mail.gmail.com> <4F67AE0B.8090508@oracle.com> <CAKOpQSw=2jrywUOY=zkrX0GuMN71zVfTNDROPR3225gbjLyU0A@mail.gmail.com>
In-Reply-To: <CAKOpQSw=2jrywUOY=zkrX0GuMN71zVfTNDROPR3225gbjLyU0A@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [PHP-DEV] php-src is now on git
From: christopher.jones@oracle.com (Christopher Jones)



On 03/19/2012 03:26 PM, Kris Craig wrote:
> On Mon, Mar 19, 2012 at 3:07 PM, Christopher Jones<
> christopher.jones@oracle.com>  wrote:
>
>>
>>
>> On 03/19/2012 01:31 PM, Kris Craig wrote:
>>
>>> Here's what I wound-up doing: The merge entries on the workflow page now
>>> contain "--no-ff" and I added an entry to the FAQ about the merge.ff option
>>> available in newer clients. This way we should be covered either way. =)
>>> --Kris
>>>
>>
>> Is this supported by the php-src repo?  This is what I get after using
>> --no-ff:
>>
>> $ git push origin
>> To https://git.php.net/**repository/php-src.git<https://git.php.net/repository/php-src.git>
>>   ! [rejected]        PHP-5.3 ->  PHP-5.3 (non-fast-forward)
>>   ! [rejected]        PHP-5.4 ->  PHP-5.4 (non-fast-forward)
>>   ! [rejected]        master ->  master (non-fast-forward)
>> error: failed to push some refs to 'https://git.php.net/**
>> repository/php-src.git<https://git.php.net/repository/php-src.git>'
>> To prevent you from losing history, non-fast-forward updates were rejected
>> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
>> 'Note about fast-forwards' section of 'git push --help' for details.
>>
>>
>> --
>> Email: christopher.jones@oracle.com
>> Tel:  +1 650 506 8630
>> Blog:  http://blogs.oracle.com/opal/
>>
>>
> That error can sometimes be misleading.  I've noticed that it typically
> happens if you're trying to push a branch containing merged commits to a
> remote version of that branch that is newer than the one your commits were
> merged into (i.e. you forgot to do a git pull followed by a git rebase
> before doing the merge).  I can't say for certain but that's a likely
> possibility that that's what happened in your case.

Could be.  Thanks for the details.

Chris


-- 
Email: christopher.jones@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/