Renaming files or directories, or moving files around in the tree can be done, but is a pain, and is not for the faint of heart. Use the normal cvs remove commands to delete the file with old name. Merging Tags into Your Branch Merging is best left to the merger who creates new trunks, but on occasion you just can't wait. It is important to keep track of what tags you have merged into your branch and tell the merger what tags you have picked up. The simplest scenario is where you never distributed a tag or merged any tags into your branch.
More complex scenarios require careful tracking of who has merged what where.
File adds and removes must also be tracked by hand. The actual merging is done with rcsmerge and diff3. This will merge into your code only the differences between the June 1 tag and the June 15 tag. This avoids applying the imp-4 to jun1 mods yet again. When you have modified a patch of code yourself and then merge someone elses change to that same code, a conflict results the automatic tools cannot resolve.