Originally Posted by
DarkDragon
:( Let's get to the bottom of things then...
My understanding (and correct me on any point that is wrong):
1. The public releases of ZC lately (2.50.3, etc) have been based on the 2.50.x branch of the repository.
2. Independently, Gleeok and others have been committing new features/fixes to the master branch of the repository.
3. The master branch contains many valuable changes.
4. The master branch also contains some changes that are considered by Saffith (and perhaps other) as "garbage."
5. 2.50.x contains changes that have not been applied to master.
So where does that leave us? Clearly 2.50.x (with cleanup which we're currently undertaking) must become the master branch, since that is the branch from which public binaries are actually being published. We cannot use the code from the current master branch for at least two reasons:
- it is not in sync with the current publicly-released binaries;
- some of the changes are "garbage" and need to be reconsidered.
Hence the plan to make 2.50.x the new master, and to look through the current-master changes and incorporate those that are worthwhile, while avoiding the garbage. Once that is done, the repository will be in a healthy state and we can start e.g. discussing changing the Allegro version or pulling in some of ZoriaRPG and Grayswandir et al's changes.
If I've gotten something wrong or you disagree with any of the above, by all means, please let me know.