Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59127
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain oracle.com from 141.146.126.227 cause and error)
Message-ID: <4F6BB4AA.2090208@oracle.com>
Date: Thu, 22 Mar 2012 16:24:26 -0700
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:10.0) Gecko/20120129 Thunderbird/10.0
MIME-Version: 1.0
To: PHP Developers Mailing List <internals@lists.php.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Git merging fun and a local clone-per branch workflow
From: christopher.jones@oracle.com (Christopher Jones)

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.  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.  At some
    stage somehow '21 commits' got merged to PHP 5.4.  I swear 'git
    diff' was only showing my changes.

2. Long term, to document the desired steps (as opposed to those I was
    doing), Alexey Shein worked out some scenarios:

        https://gist.github.com/2165086

    He prefers the 2nd set 'README-3'. These steps are untested and
    there may still be issues with handling NEWS.  Suggestions welcome.
    Note these use https for my behind-a-firewall situation.

Chris

PS dsp is (or should be) busy with studying, so there might be a
hiatus or slow down for git migration.


-- 
Email: christopher.jones@oracle.com
Tel:  +1 650 506 8630
Blog:  http://blogs.oracle.com/opal/