> I'm by no means a CVS Guru, and I'd like to hear about some opinions > about where I want TMDA-cgi to go from here, and more specifically, how > to do it. > > Basicly, I'm certain we need 2 branches, one for compatibility with > TMDA 1.0.x and one for compatibility with TMDA 1.1.x. I want to do > this ASAP, as 1.1 is steadily moving away from 1.0. > > That said, there will be a huge overlap of code between the two, and > when I add a new feature to one, I don't want it to be a huge chore to > add the same feature again to the other. Also, some files will (and > should) always be exactly the same in both branches. Some files will > be very different. > > Is there some easy way to do this? Can I add a feature to one branch, > then somehow merge it with the other, changing only compatibility > things? > > Any thoughts / good CVS references / People who want to help me?
The CVS 'branches' are what you need to learn about. There are two cases that you could be talking about: 1) 1.0 is done other than general bug fixing and support and 1.1 is the future and where you want to spend time doing 'real' work and 2) 1.0 and 1.1 will each have their own lives with some features being added to one, the other and both Case #1 is a more normal case and easy to maintain. I can send you a cheat sheet (more my own notes) on commonly needed CVS actions and the syntax, but it is on the home computer... tom _________________________________________________ tmda-workers mailing list ([EMAIL PROTECTED]) http://tmda.net/lists/listinfo/tmda-workers
