Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59129 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 62110 invoked from network); 23 Mar 2012 00:33:16 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 23 Mar 2012 00:33:16 -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:30606] helo=rcsinet15.oracle.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 44/2E-16309-AC4CB6F4 for ; Thu, 22 Mar 2012 19:33:15 -0500 Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by rcsinet15.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id q2N0XAhj023339 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 23 Mar 2012 00:33:11 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 q2N0XAVF002496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 23 Mar 2012 00:33:10 GMT Received: from abhmt111.oracle.com (abhmt111.oracle.com [141.146.116.63]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id q2N0X9Mu018749; Thu, 22 Mar 2012 19:33:10 -0500 Received: from [130.35.71.238] (/130.35.71.238) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Mar 2012 17:31:31 -0700 USER-AGENT: Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20120129 Thunderbird/10.0 MIME-Version: 1.0 Message-ID: <4F6BC462.6060001@oracle.com> Date: Thu, 22 Mar 2012 17:31:30 -0700 (PDT) To: Kiall Mac Innes Cc: PHP Developers Mailing List References: <4F6BB4AA.2090208@oracle.com> 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-CT-RefId: str=0001.0A090205.4F6BC4C8.0013,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 03/22/2012 05:09 PM, Kiall Mac Innes wrote: > Right - `git diff` shows the different between HEAD (The last commit > of the branch your are currently on) and what you have yet to > commit. I was doing the diffs compared with the origin/* branches, as shown in the gist, https://gist.github.com/2165086 > 2 commits will be merged - Assuming nobody else has changed 5.3 since the last time anyone merged it into 5.4 > > If on the other hand, someone else committed to 5.3, did not merge to 5.4, and you have that commit in your 5.3 branch.. then the merge will do 3 commits, even though you only made 2. > > This is likely what you saw. Maybe! At this stage finding the best workflow that allows multiple local branch directories to co-exist and aligns with PHP's general git processes is the issue. I notice Dmitry mentioned git-new-workdir. Does anyone have a workflow and comments on that (including with respect to NEWS)? > > `git log --oneline --graph` is a useful command to try and understand what happened, and what was merged where.. gitk shows this too. > > Thanks, > Kiall Thanks for the comments. Chris -- Email: christopher.jones@oracle.com Tel: +1 650 506 8630 Blog: http://blogs.oracle.com/opal/