Re: [gentoo-catalyst] rfc: merging catalyst git branches

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

-----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-----