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. What are your thoughts, especially releng, because you did a lot of work on the 3.0 code. If we port commits from catalyst_2 to the 3.0 branch, can we get that code up and running? What commits on that branch should be ported? William
pgp0oRBkzQM0T.pgp
Description: PGP signature
