From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Sj2OA-0002L4-8Y for garchives@archives.gentoo.org; Mon, 25 Jun 2012 06:03:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1292E0CA4 for ; Mon, 25 Jun 2012 06:03:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 72ACCE0C74 for ; Mon, 25 Jun 2012 04:04:50 +0000 (UTC) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id 0340C1B4153 for ; Mon, 25 Jun 2012 04:04:49 +0000 (UTC) Received: by pbbrr13 with SMTP id rr13so7097568pbb.40 for ; Sun, 24 Jun 2012 21:04:49 -0700 (PDT) Received: by 10.68.227.197 with SMTP id sc5mr37087807pbc.58.1340597089117; Sun, 24 Jun 2012 21:04:49 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Received: by 10.68.138.233 with HTTP; Sun, 24 Jun 2012 21:04:28 -0700 (PDT) In-Reply-To: <4FE7A3C2.8010408@gentoo.org> References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE16A9A.4090609@gentoo.org> <20111209031956.GA11180@linux1> <4EE1919B.5000308@gentoo.org> <20111209161625.GA5998@linux1> <4EE25814.1000308@gentoo.org> <20111210144531.GA3616@linux1> <4EE3DA15.4060307@gentoo.org> <4FE7A3C2.8010408@gentoo.org> From: Matt Turner Date: Mon, 25 Jun 2012 00:04:28 -0400 Message-ID: Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches To: gentoo-catalyst@lists.gentoo.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9071893d-59cb-42b4-ae73-52027a61ea21 X-Archives-Hash: 897c19597a175dab9fb923d1b9a27fce On Sun, Jun 24, 2012 at 7:33 PM, Sebastian Pipping wrote= : > On 12/10/2011 11:15 PM, Sebastian Pipping wrote: >> [T]he full run on my shell: >> >> =A0# git branch catalyst_3 master >> >> =A0# git checkout master >> >> =A0# git merge $(git commit-tree catalyst_2^{tree} \ >> =A0 =A0 =A0-p catalyst_2 -p master \ >> =A0 =A0 =A0<<<"Replace content on master with content from catalyst_2") >> >> =A0# git push origin master >> >> =A0# git push origin catalyst_3 >> >> >> Results is: >> >> =A0- 2.x content on branch master (and catalyst_2) >> >> =A0- 3.x content on branch catalyst_3 > > This procedure above is still left to do. =A0Any objections? > With no objections, I will go forward on next monday (2012-07-02). If you're confident it'll work -- please proceed. No use in waiting.