Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59128
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain managedit.ie designates 209.85.210.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <4F6BB4AA.2090208@oracle.com>
References: <4F6BB4AA.2090208@oracle.com>
Date: Fri, 23 Mar 2012 00:09:12 +0000
Message-ID: <CAGSj+Qs8M+VNSO4aQcn5F4cjfH1NWa7hvc5tHB9NWDypzx_1Xw@mail.gmail.com>
To: Christopher Jones <christopher.jones@oracle.com>
Cc: PHP Developers Mailing List <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=14dae93405a5c9f7d904bbddd6ac
Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow
From: kiall@managedit.ie (Kiall Mac Innes)

--14dae93405a5c9f7d904bbddd6ac
Content-Type: text/plain; charset=ISO-8859-1

On Thu, Mar 22, 2012 at 11:24 PM, Christopher Jones <
christopher.jones@oracle.com> wrote:

> 1. I had fun with a couple of small git merges today.  I was trying to
>   use local clones as briefly outlined on irc by dsp.


Multiple clones for each branch will be *much **much* harder to manage from
a Git POV.

From a build POV though, it might be easier as you can avoid lots of `make
clean` etc..


> The goal is to
>   have different local directories for each of the three branches:
>   5.3, 5.4 and 'trunk'.  The resulting pushes I made today are a
>   little strange and need reviewing/reverting.  For example my
>   oci8/README fix doesn't seem to have got merged to 5.3.


With multiple local clones, you can end up with some strange situations if
you don't know exactly what you're pushing/pulling between them AND the
central repo..


>  At some stage somehow '21 commits' got merged to PHP 5.4.  I swear 'git
>   diff' was only showing my changes.
>

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.

So - When you then merge $current_branch into $other_branch, the merge will
merge all commits from $current_branch into $other_branch, not just your
own..

eg:

$ git checkout PHP-5.3
# Edit some files
$ git commit ..
# Edit some files 2
$ git commit ..
$ git checkout PHP-5.4
$ git merge PHP-5.3

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.

`git log --oneline --graph` is a useful command to try and understand what
happened, and what was merged where..

Thanks,
Kiall

--14dae93405a5c9f7d904bbddd6ac--