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 1RZVDN-0006sr-Ay for garchives@archives.gentoo.org; Sat, 10 Dec 2011 22:16:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBE6521C077; Sat, 10 Dec 2011 22:16:04 +0000 (UTC) Received: from smtprelay02.ispgateway.de (smtprelay02.ispgateway.de [80.67.31.25]) by pigeon.gentoo.org (Postfix) with ESMTP id A2E0621C077 for ; Sat, 10 Dec 2011 22:16:04 +0000 (UTC) Received: from [78.52.99.20] (helo=[192.168.1.2]) by smtprelay02.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1RZVD9-00031Q-HX for gentoo-catalyst@lists.gentoo.org; Sat, 10 Dec 2011 23:16:03 +0100 Message-ID: <4EE3DA15.4060307@gentoo.org> Date: Sat, 10 Dec 2011 23:15:49 +0100 From: Sebastian Pipping User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111118 Thunderbird/8.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> In-Reply-To: <20111210144531.GA3616@linux1> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Df-Sender: c3BpbmctZ2VudG9vQGJpbmVyYS5kZQ== X-Archives-Salt: 1872b5c3-d11a-452b-844c-b44254587b62 X-Archives-Hash: 2223181437d5627a5c065369ecd4c923 On 12/10/2011 03:45 PM, William Hubbs wrote: >> - supports branching catalyst_2 off master, too s/catalyst_2/catalyst_3/ > The method you are suggesting does _NOT_ make the current content of > master appear on catalyst_3, which is the other part of what releng is > requesting. That's a trivial addition. With it, the 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 catalyest_2) - 3.x content on branch catalyest_3 > What I think I can do, but I'm not quite sure how to do it, is: > > 1) create a catalyst_3 branch at the same point in history where > catalyst_2 was created. I believe I can accomplish this with > > git branch catalyst_3 $(git merge-base master catalyst_2) The branch head is moving along with each commit so it would end up at the current master in the end, anyway. If you like to mark the point where catalyst 3.x was started, a tag would be the right tool, not a branch. > 2) put the code on master that is _NOT_ on catalyst_2 on catalyst_3. > > Any suggestions for how to do this? I'm not sure what you mean by that. > 3) put the code on catalyst_2 on master. > > What about this? Either git commit-tree or forced push. Best, Sebastian