| 1 |
All, |
| 2 |
|
| 3 |
this has been mentioned in a couple of threads, so I want to bring it up |
| 4 |
in a separate thread so that we can keep the discussions organized. :-) |
| 5 |
|
| 6 |
As you know, catalyst has two branches in its git repository, master, |
| 7 |
which was going to be catalyst 3.0, and a branch called catalyst_2 which |
| 8 |
is the branch being used by releng for official releases. |
| 9 |
|
| 10 |
We know from what Jorge said that the master branch is broken. |
| 11 |
|
| 12 |
Right now, we are commiting changes to both branches, but that is not a |
| 13 |
good idea over the long term. We need to figure out if we should keep |
| 14 |
master and try to release 3.0 from there at some point. If that is what |
| 15 |
we want to do, we need to go through the catalyst_2 branch and port |
| 16 |
relevant commits to master. |
| 17 |
|
| 18 |
If we are not interested in the 3.0 code, we should probably find a way |
| 19 |
to revert all of it from master with one commit then rebase the 2.0 |
| 20 |
branch on master and move it back there. |
| 21 |
|
| 22 |
What are your thoughts, especially releng, because you did a lot of work |
| 23 |
on the 3.0 code. If we port commits from catalyst_2 to the 3.0 branch, |
| 24 |
can we get that code up and running? What commits on that branch should |
| 25 |
be ported? |
| 26 |
|
| 27 |
William |
Archives