Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59151 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 39811 invoked from network); 24 Mar 2012 16:04:12 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 24 Mar 2012 16:04:12 -0000 Authentication-Results: pb1.pair.com header.from=christopher.jones@oracle.com; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=christopher.jones@oracle.com; spf=permerror; sender-id=unknown Received-SPF: error (pb1.pair.com: domain oracle.com from 148.87.113.117 cause and error) X-PHP-List-Original-Sender: christopher.jones@oracle.com X-Host-Fingerprint: 148.87.113.117 rcsinet15.oracle.com Received: from [148.87.113.117] ([148.87.113.117:35292] helo=rcsinet15.oracle.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 8A/30-37560-670FD6F4 for ; Sat, 24 Mar 2012 11:04:07 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q2OG43Z8023192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 24 Mar 2012 16:04:04 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id q2OG42xX000222 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 24 Mar 2012 16:04:03 GMT Received: from ubhmt105.oracle.com (ubhmt105.oracle.com [156.151.24.10]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q2OG425C023704 for ; Sat, 24 Mar 2012 11:04:02 -0500 Received: from hubby.local (/50.131.91.176) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 24 Mar 2012 09:04:01 -0700 Message-ID: <4F6DF06F.3040104@oracle.com> Date: Sat, 24 Mar 2012 09:03:59 -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> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CT-RefId: str=0001.0A090205.4F6DF074.0044,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 8:30 AM, Alexey Shein wrote: > 24 марта 2012 г. 18:23 пользователь David Soria Parra написал: >> On 2012-03-24, Alexey Shein wrote: >>> Hello, >>> >>> Just wanted to say that I updated multiple working dirs scenario here >>> https://gist.github.com/2165086/, which is *much* more simplified now, >>> thanks to dsp for hint about git-new-workdir script. >>> It should work fine if all changes from downstream branches (such as >>> PHP-5.3) are always merged into upstream (PHP-5.4). >>> If it's not the case, then some other solution is needed. >> >> Can you pleae add a description like that to the php wiki ? > > Done. https://wiki.php.net/vcs/gitfaq#multiple_working_copies_workflow > >> -- >> PHP Internals - PHP Runtime Development Mailing List >> To unsubscribe, visit: http://www.php.net/unsub.php >> > > > Nice work Alexey. Can you expand on the "if necessary" part of the setting the pushurl? 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. Chris -- Email: christopher.jones@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/