Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59153 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 66028 invoked from network); 24 Mar 2012 18:48:05 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 24 Mar 2012 18:48:05 -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:35921] helo=acsinet15.oracle.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id F6/45-37560-3E61E6F4 for ; Sat, 24 Mar 2012 13:48:04 -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 q2OIlxnc025048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Sat, 24 Mar 2012 18:47:59 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q2OIlwSA015435 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 24 Mar 2012 18:47:58 GMT Received: from ubhmt102.oracle.com (ubhmt102.oracle.com [156.151.24.7]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q2OIlv8r009387 for ; Sat, 24 Mar 2012 13:47:58 -0500 Received: from hubby.local (/50.131.91.176) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 24 Mar 2012 11:47:57 -0700 Message-ID: <4F6E16DC.9030803@oracle.com> Date: Sat, 24 Mar 2012 11:47:56 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:11.0) Gecko/20120313 Thunderbird/11.0 MIME-Version: 1.0 To: internals@lists.php.net References: <4F6BB4AA.2090208@oracle.com> <4F6BC462.6060001@oracle.com> <4F6DF06F.3040104@oracle.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; 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.0A090202.4F6E16DF.008F,ss=1,re=0.000,fgs=0 Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow From: christopher.jones@oracle.com (Christopher Jones) On 3/24/12 11:17 AM, Alexey Shein wrote: >> Nice work Alexey. >> >> Can you expand on the "if necessary" part of the setting the >> pushurl? > I removed that part and added some explanation about clone urls in the > beginning. Since this workflow is generally for core devs ssh/https > are read/write so you don't need separate setting push-urls. > >> My sense of completeness makes me think the content of your >> text should be in the wiki, so it can be updated by anyone >> in the future. >> > Done: https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflow > Thanks! Chris -- Email: christopher.jones@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/