History: TikiCVSTags

A bit of discussion on the dev list came up with the following naming convention for CVS Tags.

Tags used with CVS branches should start with the word BRANCH- followed by the version number that the branch represents.

The branch for version 1.7 would be tagged with

• BRANCH-1-7

Tags used to represent a release should start with the word REL- followed by the release number and sub-version counter.
This tag can represent a release candidate or subsequent bug fixes to the release. All release tags should always be part of the appropriate branch.

Releases should be tagged as

• for inital 1.7 version
  • REL-1-7
• for followed bugfix version 1.7.1
  • REL-1-7-1
• hope this will not happen 😊
  • REL-1-7-2

• REL-1-7-RC2
• REL-1-7-1-RC1
• REL-1-8-RC3

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.7 branch, the root would be tagged with:

• ROOT-1-7

Merges are generally used to bring changes made in a branch back into the main trunk. Tag a merge point using the word MERGE- followed by the two tags being merged separated by -to-.

Heres a worked example to merge the latest changes in the 1.7 branch with the current HEAD. It assumes that the previous merge on this branch will be tagged as MERGE-BRANCH-1-7-to-HEAD.

• Switch to HEAD

cvs up -AdP

• Merge in changes from BRANCH-1-7 that happened between tag MERGE-BRANCH-1-7-to-HEAD and 'now'

cvs up -kk -j MERGE-BRANCH-1-7-to-HEAD -j BRANCH-1-7

• Switch to the head of the 1.7 branch

cvs up -r BRANCH-1-7

• Move the merge tag to head of BRANCH-1-7 i.e. 'now'

cvs tag -F MERGE-BRANCH-1-7-to-HEAD