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 1RZOFw-0002m0-ID for garchives@archives.gentoo.org; Sat, 10 Dec 2011 14:50:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECBB121C0E7; Sat, 10 Dec 2011 14:50:16 +0000 (UTC) Received: from mail-yx0-f181.google.com (mail-yx0-f181.google.com [209.85.213.181]) by pigeon.gentoo.org (Postfix) with ESMTP id A945F21C0E7 for ; Sat, 10 Dec 2011 14:50:16 +0000 (UTC) Received: by yenm3 with SMTP id m3so3753616yen.40 for ; Sat, 10 Dec 2011 06:50:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=q6CNtsEBhXSuweWNv1VlflG3OFT8uf+p4t0cRaCfDmo=; b=ZtRc/WPBU+z9qJv8QKbCmZXItD69hfsCUn6Ujuz4XbcqMlQePo7j7Si19iO2Nr12Je zWLJb0cJrtStJpWyj1eucr8HGlXmblfYqGDDlr6TCT3dcKmz6vyRvgPLhMUpyoNrPZZ/ hnY4ioPtaAq977OjECs5rDXnk1JOtuWyFnep0= Received: by 10.236.110.110 with SMTP id t74mr2359026yhg.91.1323528616174; Sat, 10 Dec 2011 06:50:16 -0800 (PST) Received: from linux1 (cpe-76-187-77-158.tx.res.rr.com. [76.187.77.158]) by mx.google.com with ESMTPS id l31sm20681363yhj.22.2011.12.10.06.50.12 (version=SSLv3 cipher=OTHER); Sat, 10 Dec 2011 06:50:14 -0800 (PST) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Sat, 10 Dec 2011 08:45:31 -0600 Date: Sat, 10 Dec 2011 08:45:31 -0600 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches Message-ID: <20111210144531.GA3616@linux1> Mail-Followup-To: gentoo-catalyst@lists.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> 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 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jRHKVT23PllUwdXP" Content-Disposition: inline In-Reply-To: <4EE25814.1000308@gentoo.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: 4a796c8b-fec9-4d2e-90e1-24887751eac6 X-Archives-Hash: 5c7f3f65fc0d639231567011c2361d5c --jRHKVT23PllUwdXP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 09, 2011 at 07:48:52PM +0100, Sebastian Pipping wrote: > On 12/09/2011 05:16 PM, William Hubbs wrote: > > Yes, I saw it, but it doesn't seem to do what we want. It merges the > > branches together instead of swapping them. >=20 > Maybe it's not what _you_ want, but it does >=20 > - make catalyst_2 content appear on master >=20 > - doesn't break fast forward "git pull" for anyone >=20 > - supports branching catalyst_2 off master, too 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. 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) 2) put the code on master that is _NOT_ on catalyst_2 on catalyst_3. Any suggestions for how to do this? 3) put the code on catalyst_2 on master. What about this? William --jRHKVT23PllUwdXP Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk7jcIsACgkQblQW9DDEZTgDXgCffnrIKnvlEEAUv3mX63vVObBm 7WoAnjOIYHe4grPdBDTrpUuBKu7VEDls =ynH7 -----END PGP SIGNATURE----- --jRHKVT23PllUwdXP--