A bit of discussion on the dev list came up with the following naming convention for CVS Tags.
Branch Roots
When creating a branch, you should tag the trunk from which the branch was created. This is known as the root of the branch. Tags used to represent branch roots should start with the word ROOT- followed by the version number.
For the version 1.9 branch, the root would be tagged with:
Branch Tags
Tags used with CVS branches should start with the word BRANCH- followed by the version number that the branch represents. A branch tag always represents the HEAD of the branch.
The branch for version 1.9 would be tagged with
Release Tags
Tags used to represent a release should start with the word REL- followed by the release number and sub-version counter.
Releases should be tagged as
RC tags should be applied to the main trunk. A branch should be created once the RC phase is complete. Merges
Merges are generally used to bring changes made in a branch back into the main trunk. It seems that before Tikiwiki developers used to tag a merge point using the word MERGE- followed by the two tags being merged separated by -to-. Now this tag seems to be used on HEAD to indicate last merge (?) and on BRANCH-1-9 we use shorter MERGE-1-9-HEAD instead. Here's a worked example(UN-VERIFIED) to merge the latest changes in the 1.9 branch with the current HEAD. It assumes that the previous merge on this branch will be tagged as MERGE-1-9-HEAD.
You can also see some more detailed example of CVS merging. Experimental Branches
|