CVS-based branch Development

The branch development in CVS is as follows:
1. First create a trunk [the tag name ends with main]
2. Create numerous branches on the trunk [branch at the end of the tag name], and then many people can develop based on this branch.
3. When the branches reach a certain number, you can merge these branches and return them to the trunk. [in this case, merge is required to merge multiple branchs, and then click the main tag.]

Branch-based development is very common. The master can maintain a stable version, and the branch can try more features, but the branch cannot open more. Otherwise, it will be very painful to return to the master.
1. CVS has a trunk by default. There may be many tags in the trunk. These tags are trunk tags.
2. If you want to create a branch, you can run the CVS tag-B-r xxx_main xxx_branch command to output a branch from a trunk. [If-R is not specified, then branch from the latest trunk]
3. Check out and update the branch CVS co-r xxx_branch.../CVS up-r xxx_branch...
4. Check the current branch CVS St-V...

5. merge;
A. Add in different locations, and the merge results are both added.
B. delete the files in different locations. Both of them are deleted in the merged results.
C. Make changes at different locations. The merge results will include changes to the two.
The merged conflicts are displayed in the source file, and we need to manually modify them...

6. merge a local copy, CVS Update-J xxx_branch
7. Replace the branch with CVS Update-J xxxx1-J xxxx2 replace xxx2 with XXX1
8. Create a new tag on the branch, CVS tag XXXXX ....

9. Main regression line
A. Check out the current main code CVS Update-ADC.
B. From the branch merge to the trunk CVS Update-D-J head-J XXXXX [a special mark on the head indicates the latest trunk tag], and then here merge
C. CVs diff-r XXXXX: compare whether the trunk and branch are consistent
D. Check in CVS Ci
E. CVs tag xxxx_main put a tag on the trunk to return to the trunk.

10. CVs tag-D tagname deletes a tag name and removes it. The stick tag of the local file is similar to the tag of the local baseline version. The last tag displayed by CVS St-V is based on the stick tag. The last tag is the CVS tag tagname :-)

11. delete a CVS file: A. Local RM * B. CVs RM [CVS delete] C. CVs CI [CVS submit]

12. CVs add-kb... used to add binary files
Generally, CVS add is used to add files in text format, but sometimes the result is incorrect. Especially for binary files, CVS add-KB is used to add files.