Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59149
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.161.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <slrnjmrim4.g88.dsp@experimentalworks.net>
References: <4F6BB4AA.2090208@oracle.com> <CAGSj+Qs8M+VNSO4aQcn5F4cjfH1NWa7hvc5tHB9NWDypzx_1Xw@mail.gmail.com>
 <4F6BC462.6060001@oracle.com> <CAAAa2sgfP=qDSPMms4XrujMSL4yy+=sq0wyHDwz1sh7Ba=R3DQ@mail.gmail.com>
 <slrnjmrim4.g88.dsp@experimentalworks.net>
Date: Sat, 24 Mar 2012 20:30:36 +0500
Message-ID: <CAAAa2sgze4hqNcAggRAQuB6me+XKdxNhXTC=UgYvU__Wgg2UOQ@mail.gmail.com>
To: David Soria Parra <dsp@php.net>
Cc: internals@lists.php.net
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow
From: confik@gmail.com (Alexey Shein)

24 =D0=BC=D0=B0=D1=80=D1=82=D0=B0 2012=C2=A0=D0=B3. 18:23 =D0=BF=D0=BE=D0=
=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C David Soria Parra=
 <dsp@php.net> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB:
> On 2012-03-24, Alexey Shein <confik@gmail.com> 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
>



--=20
Regards,
Shein Alexey