What is the best branching practice to use with CVS?
It is generally said on the mailing list that “it less painful if development is done on the trunk and releases are branched for maintenance. This way, the merge-backs are fewer when main development is going on. You will have to merge fixes from the maintenance branches to the main trunk after a release but this is less of a headache because these are generally smaller and easier to manage than merging all the changes that would be made on a development branch.” Sherk But the correct branching practice also depends on the way you want to develop, so you should also consult documentation that discusses code management branching in a general way, such as Streamed Lines: Branching Patterns for Parallel Software Development . CVS Best Practices specifically deals with other good practices for CVS use beyond branching and merging. Other good, general purpose SCM best practices information can be found at the Assembling Configuration Management Environments (ACME) Project and the Configurat
