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.77) (envelope-from ) id 1SliEF-0005eL-2V for garchives@archives.gentoo.org; Mon, 02 Jul 2012 15:07:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E318121C013 for ; Mon, 2 Jul 2012 15:07:53 +0000 (UTC) Received: from smtprelay01.ispgateway.de (smtprelay01.ispgateway.de [80.67.29.23]) by pigeon.gentoo.org (Postfix) with ESMTP id 458AD21C007 for ; Mon, 2 Jul 2012 14:55:53 +0000 (UTC) Received: from [85.179.9.163] (helo=[192.168.1.2]) by smtprelay01.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1Sli2Z-0007iP-FZ for gentoo-catalyst@lists.gentoo.org; Mon, 02 Jul 2012 16:55:51 +0200 Message-ID: <4FF1B65B.3090704@gentoo.org> Date: Mon, 02 Jul 2012 16:55:23 +0200 From: Sebastian Pipping User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120608 Thunderbird/13.0 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 To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches 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> In-Reply-To: X-Enigmail-Version: 1.5pre Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Df-Sender: c3BpbmctZ2VudG9vQGJpbmVyYS5kZQ== X-Archives-Salt: 59d6f9e3-7d4e-4a78-bb3e-59929b1a7e7b X-Archives-Hash: 6667e10f5b406d06d50a564c44870382 On 06/25/2012 06:04 AM, Matt Turner wrote: > 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: >>> >>> # git branch catalyst_3 master >>> >>> # git checkout master >>> >>> # git merge $(git commit-tree catalyst_2^{tree} \ >>> -p catalyst_2 -p master \ >>> <<<"Replace content on master with content from catalyst_2") >>> >>> # git push origin master >>> >>> # git push origin catalyst_3 >>> >>> >>> Results is: >>> >>> - 2.x content on branch master (and catalyst_2) >>> >>> - 3.x content on branch catalyst_3 >> >> This procedure above is still left to do. Any 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. Done. Best, Sebastian