CVS version branching problem

Project is almost finished, other applications to the existing project based on a few pictures and two of Chinese characters to go out to sell, the existing project will have to correct the bug, the establishment of 2 projects to merge too troublesome, decided to handle the branch management CVS.

Here are some of the basic questions that you are wondering:

1. Although only 3 pictures and 2 characters in a file need to be changed, the entire project needs to be defined as a single branch.

Current test results: to. It's OK not to define the entire project as a branch, unless someone else knows which four files you define the branch, and that's not true for the day's mother.

2. The software has a bug, changed the mainstream (head) in the code, how to do in the branch.

Current test results: With the merge, open the Branch project in Eclipse, select team-> Merge, select Head Merge to Branch, do nothing, don't be afraid, the result of merging is only kept in the current workspace, it will not affect the data in the CVS warehouse, then submit it after the merge is complete.

3. How to update back to the mainstream (head) project after the bug has been modified in the branch.

Current test results: or with the merge, in Eclipse or open (day, here is not clear whether the branch or the mainstream) project, select the team in the merge, select the branch name, the same, casual operation, merged to submit after the good.

4. After the branch is defined, the branch name is deleted.

There is no place to find the deletion, but there is a way to delete the entire project on the CVS server:-)