Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59068 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 14302 invoked from network); 19 Mar 2012 22:07:14 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 19 Mar 2012 22:07:14 -0000 Authentication-Results: pb1.pair.com smtp.mail=christopher.jones@oracle.com; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=christopher.jones@oracle.com; sender-id=unknown Received-SPF: error (pb1.pair.com: domain oracle.com from 141.146.126.227 cause and error) X-PHP-List-Original-Sender: christopher.jones@oracle.com X-Host-Fingerprint: 141.146.126.227 acsinet15.oracle.com Received: from [141.146.126.227] ([141.146.126.227:35186] helo=acsinet15.oracle.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 00/A5-19822-11EA76F4 for ; Mon, 19 Mar 2012 17:07:14 -0500 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by acsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q2JM79FU013987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 19 Mar 2012 22:07:10 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q2JM78W2011867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 19 Mar 2012 22:07:09 GMT Received: from abhmt106.oracle.com (abhmt106.oracle.com [141.146.116.58]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q2JM78N4020070; Mon, 19 Mar 2012 17:07:08 -0500 Received: from [130.35.70.154] (/130.35.70.154) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 19 Mar 2012 15:07:08 -0700 Message-ID: <4F67AE0B.8090508@oracle.com> Date: Mon, 19 Mar 2012 15:07:07 -0700 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20120129 Thunderbird/10.0 MIME-Version: 1.0 To: Kris Craig , PHP Developers Mailing List References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.4F67AE0E.0030,ss=1,re=0.000,fgs=0 Subject: Re: [PHP-DEV] php-src is now on git From: christopher.jones@oracle.com (Christopher Jones) 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 ! [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' 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/