cvs get trunk change into branch
Although I talked about I am being cool as using Git, I still need to play with CVS at work, and I got a little problem.
The problem is that there is some change in the trunk I want to incorporate into my branch, which shouldn't be that hard, something like following should work:
cvs update -j 1.5 -j 1.4 working_file
However, I want to do one step further, that is moving the tag to the new revision (or starting the branching point from 1.5 instead of my previous branching point 1.4 but stay with the old tag name). But it seems I can't use the old tag name as it complains: already exists on branch x.x.x.x, not moving tag to branch. Even with option -F (force), it still failed. Finally, after google, this works:
cvs tag -BF old_tag working_file
so making a note here.
After playing again, seems better to delete the tag first, then re-branch and tag
cvs tag -d old_tag working_file
cvs update -A working_file
cvs tag -b old_tag working_file
cvs update -r old_tag working_file
我要留言
Custom Search