1 |
-----BEGIN PGP SIGNED MESSAGE----- |
2 |
Hash: SHA1 |
3 |
|
4 |
On 08-12-2011 18:46, William Hubbs wrote: |
5 |
> On Sun, Jun 26, 2011 at 11:44:33PM -0500, William Hubbs wrote: |
6 |
>> All, |
7 |
>> |
8 |
>> this has been mentioned in a couple of threads, so I want to |
9 |
>> bring it up in a separate thread so that we can keep the |
10 |
>> discussions organized. :-) |
11 |
>> |
12 |
>> As you know, catalyst has two branches in its git repository, |
13 |
>> master, which was going to be catalyst 3.0, and a branch called |
14 |
>> catalyst_2 which is the branch being used by releng for official |
15 |
>> releases. |
16 |
>> |
17 |
>> We know from what Jorge said that the master branch is broken. |
18 |
>> |
19 |
>> Right now, we are commiting changes to both branches, but that is |
20 |
>> not a good idea over the long term. We need to figure out if we |
21 |
>> should keep master and try to release 3.0 from there at some |
22 |
>> point. If that is what we want to do, we need to go through the |
23 |
>> catalyst_2 branch and port relevant commits to master. |
24 |
>> |
25 |
>> If we are not interested in the 3.0 code, we should probably find |
26 |
>> a way to revert all of it from master with one commit then rebase |
27 |
>> the 2.0 branch on master and move it back there. |
28 |
> |
29 |
> If no one objects, I will look into doing this next week; the |
30 |
> catalyst_2 code should move to master since there doesn't appear to |
31 |
> be any work going on for releasing catalyst 3. |
32 |
> |
33 |
> Comments? |
34 |
|
35 |
William, |
36 |
|
37 |
I'd rather not lose the work for catalyst_3. I understand and agree we |
38 |
use the catalyst_2 branch for our releases, so I'd rather move master |
39 |
to a new branch, call it catalyst_3, experimental or something else, |
40 |
and then make catalyst_2 as master. |
41 |
|
42 |
|
43 |
> William |
44 |
> |
45 |
|
46 |
- -- |
47 |
Regards, |
48 |
|
49 |
Jorge Vicetto (jmbsvicetto) - jmbsvicetto at gentoo dot org |
50 |
Gentoo- forums / Userrel / Devrel / KDE / Elections / RelEng |
51 |
-----BEGIN PGP SIGNATURE----- |
52 |
Version: GnuPG v2.0.18 (GNU/Linux) |
53 |
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ |
54 |
|
55 |
iQIcBAEBAgAGBQJO4WqaAAoJEC8ZTXQF1qEPfQwQALbl7ut059PYHqMZFFmKyjy7 |
56 |
Y7PMRB1UroTVOA3atyo2abGZ9PmL34Gh2ns1SF2LxXSP2TlUuSTzswTlEvPj9Stc |
57 |
zsmcfxH+OpKAykgV1UJjc6PTuarlGRihmOES2ezLSneoKxvvSXbIH37wqGFOCld/ |
58 |
bzaFjBL/TCvfXZIeXngHQ9SXIdEp9IWKlL14/WGmiP2iKeHPZ8O4j0k/OL8h1Nvx |
59 |
BTD83F1UruELkWkLQz7F/yGW64AFH5EzIC4ebnA9NMv6KhsF5G2VDfwEKuJwgCAe |
60 |
XE8Jt9IdEDX9akOflHlCLo7iwPyMsssGqXUo53b/uThOusRZkSvNG0+jVOvTL4oh |
61 |
387VFXo3cNKPyQns/EQQml2jF2MNCqbHVEeW/s3IzQg6NGT3JNu5wjHTJz1hcaqs |
62 |
rcb54+F/jwhd1J4s+xXKuU0sJAJvmFGneHfCnPs+EMXLS2mGw1YNu4+FlKwLwdQN |
63 |
FTYhUB/kyFHM/c2MGTO2V/M3dt5efu5tgaF1QqCfsOQiR2dXIGkHqStLqZHHfK2J |
64 |
Ets+epXt3iGIN0udKIEWSqaAwKQW40RstbWlEcUT2TD0GBjW+ln5oU/d4KkvS2rn |
65 |
IBfN+19hW2OFt0KYo+Bc2GTYCRIPaRYDikyib4ZnzKhSnGKMjxPGYiczmgDIcvr8 |
66 |
FQwNtsOccSDK69tD49FQ |
67 |
=96Ty |
68 |
-----END PGP SIGNATURE----- |