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 1RYr4w-0007J8-QC for garchives@archives.gentoo.org; Fri, 09 Dec 2011 03:24:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAC6021C0C6; Fri, 9 Dec 2011 03:24:44 +0000 (UTC) Received: from mail-gy0-f181.google.com (mail-gy0-f181.google.com [209.85.160.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 8189B21C0C6 for ; Fri, 9 Dec 2011 03:24:44 +0000 (UTC) Received: by ghbg18 with SMTP id g18so2482124ghb.40 for ; Thu, 08 Dec 2011 19:24:44 -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=8hWOaeggXuzgubPY5XOwHHXqEMg7r726yJ8qV4AMj0c=; b=iAMNsBrKP8EBKu+9g4AK/OSvPOqNZbdV/014jn5hGVGTmiAcbDudXKTkohH90MI8/4 umpTzju5UckjmUwdf4B0PVZ5V9XLaOsS8KTCG//DEwHy6w9z0mB6SZwKj7D2VEeWEdFo 5lOBXx540xipYbl6xc3xslnBSzGRpjhf8XbRQ= Received: by 10.236.197.99 with SMTP id s63mr9022384yhn.14.1323401084060; Thu, 08 Dec 2011 19:24:44 -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 n5sm12693022yhk.1.2011.12.08.19.24.41 (version=SSLv3 cipher=OTHER); Thu, 08 Dec 2011 19:24:42 -0800 (PST) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Thu, 08 Dec 2011 21:19:56 -0600 Date: Thu, 8 Dec 2011 21:19:56 -0600 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches Message-ID: <20111209031956.GA11180@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <20110627044433.GA9772@linux1> <20111208194623.GA2416@linux1> <4EE16A9A.4090609@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="7AUc2qLy4jB3hD7Z" Content-Disposition: inline In-Reply-To: <4EE16A9A.4090609@gentoo.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: 430793fa-0b12-46c5-8b22-8606b3e29530 X-Archives-Hash: 0fbdcc95476b789d9999d2bce36f9fe2 --7AUc2qLy4jB3hD7Z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Dec 09, 2011 at 12:55:38AM -0100, Jorge Manuel B. S. Vicetto wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 >=20 > On 08-12-2011 18:46, William Hubbs wrote: > > On Sun, Jun 26, 2011 at 11:44:33PM -0500, William Hubbs wrote: > >> All, > >>=20 > >> this has been mentioned in a couple of threads, so I want to > >> bring it up in a separate thread so that we can keep the > >> discussions organized. :-) > >>=20 > >> As you know, catalyst has two branches in its git repository, > >> master, which was going to be catalyst 3.0, and a branch called > >> catalyst_2 which is the branch being used by releng for official > >> releases. > >>=20 > >> We know from what Jorge said that the master branch is broken. > >>=20 > >> Right now, we are commiting changes to both branches, but that is > >> not a good idea over the long term. We need to figure out if we > >> should keep master and try to release 3.0 from there at some > >> point. If that is what we want to do, we need to go through the > >> catalyst_2 branch and port relevant commits to master. > >>=20 > >> If we are not interested in the 3.0 code, we should probably find > >> a way to revert all of it from master with one commit then rebase > >> the 2.0 branch on master and move it back there. > >=20 > > If no one objects, I will look into doing this next week; the > > catalyst_2 code should move to master since there doesn't appear to > > be any work going on for releasing catalyst 3. > >=20 > > Comments? >=20 > William, >=20 > I'd rather not lose the work for catalyst_3. I understand and agree we > use the catalyst_2 branch for our releases, so I'd rather move master > to a new branch, call it catalyst_3, experimental or something else, > and then make catalyst_2 as master. Hi Jorge, Ok, no problem, I'll go back to the #git channel tomorrow and investigate how to do that. I would prefer to do it without merge commits if possible, but that may mean a forced update. Are you ok with that? William --7AUc2qLy4jB3hD7Z Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk7hflwACgkQblQW9DDEZTiDuQCguxF7EIwJOgSLIBx7lzhTpnQQ VAAAnAwO5kwBBORcK/3xUA0X2JHfaAgh =ochA -----END PGP SIGNATURE----- --7AUc2qLy4jB3hD7Z--