Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59145
Return-Path: <confik@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 18405 invoked from network); 24 Mar 2012 12:59:19 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 24 Mar 2012 12:59:19 -0000
Authentication-Results: pb1.pair.com smtp.mail=confik@gmail.com; spf=pass; sender-id=pass
Authentication-Results: pb1.pair.com header.from=confik@gmail.com; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.160.170 as permitted sender)
X-PHP-List-Original-Sender: confik@gmail.com
X-Host-Fingerprint: 209.85.160.170 mail-gy0-f170.google.com  
Received: from [209.85.160.170] ([209.85.160.170:59398] helo=mail-gy0-f170.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 7E/60-18105-625CD6F4 for <internals@lists.php.net>; Sat, 24 Mar 2012 07:59:19 -0500
Received: by ghbg2 with SMTP id g2so3647900ghb.29
        for <internals@lists.php.net>; Sat, 24 Mar 2012 05:59:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :cc:content-type;
        bh=bF02zB8AZMY6Kg+yu34AkdvdCaa94qOQEi7hr1A6xWw=;
        b=SHDNfZ031eWomhtxD2TwUBfEndmq4UglDb4BcUJgnNbeTTxKEPoaQapi8ygtYqD5Jz
         RFtLRgsybqP7vhJJraEEC74WVK4KTLtQV7sWhVht/b9945RWb4bEOz14UhWwLO7Klz71
         e/FHlPARPRK7AptnxruARO4K8/4tSdK0twfBw9uX7p8p37MCiy786XY4yTJlMNswe2g9
         qFhBsc8uADKYX2DcltTxSYEW8luZIJyKVApCXoHPDBc73deSM3ggomvUYt3JTL1I/Vd1
         kRC1pwwBY8leAZ8w6OYLL30OlYulZZYYrGxASxp8rAz0YOGWx6ZqyN0phxwcT2NiXFpk
         vyCg==
Received: by 10.236.46.134 with SMTP id r6mr15517718yhb.106.1332593956151;
 Sat, 24 Mar 2012 05:59:16 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.101.213.40 with HTTP; Sat, 24 Mar 2012 05:58:55 -0700 (PDT)
In-Reply-To: <4F6BC462.6060001@oracle.com>
References: <4F6BB4AA.2090208@oracle.com> <CAGSj+Qs8M+VNSO4aQcn5F4cjfH1NWa7hvc5tHB9NWDypzx_1Xw@mail.gmail.com>
 <4F6BC462.6060001@oracle.com>
Date: Sat, 24 Mar 2012 17:58:55 +0500
Message-ID: <CAAAa2sgfP=qDSPMms4XrujMSL4yy+=sq0wyHDwz1sh7Ba=R3DQ@mail.gmail.com>
To: Christopher Jones <christopher.jones@oracle.com>
Cc: Kiall Mac Innes <kiall@managedit.ie>, 
	PHP Developers Mailing List <internals@lists.php.net>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow
From: confik@gmail.com (Alexey Shein)

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.


-- 
Regards,
Shein Alexey