1. checkout existing branch, for example main branch
%cvs checkout -r main
or
% cvs checkout .
2.create new branch based on main branch
%cvs tag -R -b release_1
3. from current main branch jump to branch release_1
%cvs update -r release_1 [file name]
4. make change on release_1 and check in
%cvs update [file_name]
%cvs commit [file_name]
5. back to main branch
%cvs update -r main [file_name]
6. Merging branch release_1 changes into main branch
%cvs update -j release_1
Any conflicts must be manually resolved by editing the file and running the tests again. When all is done we can commit the changes.
When conflicts is resolved, commit merged file to main
% cvs update [file name]
% cvs commit [file name]
阅读(4258) | 评论(0) | 转发(0) |
