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 1RYphk-0008Kt-RE for garchives@archives.gentoo.org; Fri, 09 Dec 2011 01:56:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D065421C097; Fri, 9 Dec 2011 01:56:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9608121C097 for ; Fri, 9 Dec 2011 01:56:39 +0000 (UTC) Received: from [192.168.1.77] (unknown [81.193.29.206]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: jmbsvicetto) by smtp.gentoo.org (Postfix) with ESMTPSA id BA5301B400E for ; Fri, 9 Dec 2011 01:56:38 +0000 (UTC) Message-ID: <4EE16A9A.4090609@gentoo.org> Date: Fri, 09 Dec 2011 00:55:38 -0100 From: "Jorge Manuel B. S. Vicetto" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111120 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> In-Reply-To: <20111208194623.GA2416@linux1> X-Enigmail-Version: 1.3.3 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Archives-Salt: d79f8210-7cbe-4cc8-8f3b-0d4f1567677d X-Archives-Hash: 3423b4bdd7098d38586791042e0520f9 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08-12-2011 18:46, William Hubbs wrote: > On Sun, Jun 26, 2011 at 11:44:33PM -0500, William Hubbs wrote: >> All, >> >> 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. :-) >> >> 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. >> >> We know from what Jorge said that the master branch is broken. >> >> 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. >> >> 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, 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. > William > - -- Regards, Jorge Vicetto (jmbsvicetto) - jmbsvicetto at gentoo dot org Gentoo- forums / Userrel / Devrel / KDE / Elections / RelEng -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJO4WqaAAoJEC8ZTXQF1qEPfQwQALbl7ut059PYHqMZFFmKyjy7 Y7PMRB1UroTVOA3atyo2abGZ9PmL34Gh2ns1SF2LxXSP2TlUuSTzswTlEvPj9Stc zsmcfxH+OpKAykgV1UJjc6PTuarlGRihmOES2ezLSneoKxvvSXbIH37wqGFOCld/ bzaFjBL/TCvfXZIeXngHQ9SXIdEp9IWKlL14/WGmiP2iKeHPZ8O4j0k/OL8h1Nvx BTD83F1UruELkWkLQz7F/yGW64AFH5EzIC4ebnA9NMv6KhsF5G2VDfwEKuJwgCAe XE8Jt9IdEDX9akOflHlCLo7iwPyMsssGqXUo53b/uThOusRZkSvNG0+jVOvTL4oh 387VFXo3cNKPyQns/EQQml2jF2MNCqbHVEeW/s3IzQg6NGT3JNu5wjHTJz1hcaqs rcb54+F/jwhd1J4s+xXKuU0sJAJvmFGneHfCnPs+EMXLS2mGw1YNu4+FlKwLwdQN FTYhUB/kyFHM/c2MGTO2V/M3dt5efu5tgaF1QqCfsOQiR2dXIGkHqStLqZHHfK2J Ets+epXt3iGIN0udKIEWSqaAwKQW40RstbWlEcUT2TD0GBjW+ln5oU/d4KkvS2rn IBfN+19hW2OFt0KYo+Bc2GTYCRIPaRYDikyib4ZnzKhSnGKMjxPGYiczmgDIcvr8 FQwNtsOccSDK69tD49FQ =96Ty -----END PGP SIGNATURE-----