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 1RYkAZ-0001iE-Ah for garchives@archives.gentoo.org; Thu, 08 Dec 2011 20:02:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C65C621C1CB for ; Thu, 8 Dec 2011 20:02:12 +0000 (UTC) Received: from mail-gx0-f181.google.com (mail-gx0-f181.google.com [209.85.161.181]) by pigeon.gentoo.org (Postfix) with ESMTP id 6085C21C187 for ; Thu, 8 Dec 2011 19:51:31 +0000 (UTC) Received: by ggnr1 with SMTP id r1so2701996ggn.40 for ; Thu, 08 Dec 2011 11:51:30 -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=CffddYiiA99a0pHMNHEQOs6LHAvLHOmYlko1T3eF8HM=; b=iZgpdKqlmsmUiQbrTv7YpEpZDm4uqug5JphwomnDemIYkY7R4NBNrMrdIQLbGuRWD4 NHYuOn8FJm4lVM+uFyEWs+qV2TLpVAtLQT78odFQ+jV9tr7C54Z5+ccxN8ZxS5pHfRgm Q7DEp0XQMXaaflUl8B0RAUizX7IgXVZvINaQo= Received: by 10.236.189.97 with SMTP id b61mr7019948yhn.116.1323373890581; Thu, 08 Dec 2011 11:51:30 -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 9sm17136539any.3.2011.12.08.11.51.24 (version=SSLv3 cipher=OTHER); Thu, 08 Dec 2011 11:51:26 -0800 (PST) Sender: William Hubbs Received: by linux1 (sSMTP sendmail emulation); Thu, 08 Dec 2011 13:46:23 -0600 Date: Thu, 8 Dec 2011 13:46:23 -0600 From: William Hubbs To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] rfc: merging catalyst git branches Message-ID: <20111208194623.GA2416@linux1> Mail-Followup-To: gentoo-catalyst@lists.gentoo.org References: <20110627044433.GA9772@linux1> 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="SUOF0GtieIMvvwua" Content-Disposition: inline In-Reply-To: <20110627044433.GA9772@linux1> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: b7a90438-66b3-4899-a3d2-2ab14f4df3be X-Archives-Hash: 21c03c5c74eef097deaa0da51bdce913 --SUOF0GtieIMvvwua Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. 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. Comments? William --SUOF0GtieIMvvwua Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEARECAAYFAk7hFA8ACgkQblQW9DDEZTho0ACeIycGwsiCZqfiLRMxBpG1tE+0 zpYAnj6zhVSJOH+9octibaSEoINWlUTn =XimG -----END PGP SIGNATURE----- --SUOF0GtieIMvvwua--