There seems to be a problem in branching support with removed files.
Repeat by:
1. Make changes to the local copy, including deleting files.
2. Decide that you want to commit to a branch, not the trunk.
3. 'cvs tag' will not work, nor will 'cvs tag -b' as there are errors to correct
first.
4. 'cvs rtag' will assign both the base-tag and the branch tag.
5. At this point, I did not want to do 'cvs update -r newBranch', as a plain
update would refetch all the files that I have deleted. So, I first do a 'cvs
rm' on the deleted files. I'm told to do a commit to force them to go away.
6. 'cvs update -r newBranch' to switch to the branch.
7. 'cvs commit' to make my commit on the branch.
EXCEPT:
The deleted files are deleted FROM THE TRUNK, NOT FROM THE BRANCH.
In other words, the deleted files are deleted not based on the version being
committed, but on the version active when the 'rm' command was issued.
Which brings up the question: How can you actually move onto a branch? The
manual does give this approach -- create the branch, update -r, commit. But if
there are deleted files, the 'update -r' will restore them (they exist with that
tag in the repository, as you have to use rtag to make that branch), and if you
delete them first they delete from the wrong version.
Or am I missing something here?
Michael
