Branches and Tags

The branches are a feature of CVS that allows the development to be partitioned so that one stream does not affect the other. They prove to be useful, when there is a need to perform modifications that are hard to perform as a consecutive gradual transitions that work well in the usual course of development. When files that are depended upon by numerous other files need to be substantially changed all the other would have to be modified along with them. That would require that a lone developer performs all these changes in his own snapshot and then checks them all in, causing the sources to leap forward. As your project grows, situations arise that this is no longer possible. It's good to have version control on the gradual changes as opposed to quantum-leap changes. It's also important to have the larges set of eyes possible looking at the code as soon as possible. On the other hand, we strive to keep XDoclet CVS tree compilable and working at all times. This calls for usage of branches whenever vast modifications of the sources are needed.

The CVS book describes multiple approaches to performing development using branches. The simplest approach called Flying Fish technique will fit our needs best. It involves creating a branch when there is a need for a separate thread of development, and abandoning the branch once all the changes are merged with the trunk.