Chinaunix首页 | 论坛 | 博客
  • 博客访问: 202528
  • 博文数量: 20
  • 博客积分: 1530
  • 博客等级: 上尉
  • 技术积分: 525
  • 用 户 组: 普通用户
  • 注册时间: 2006-07-31 16:26
文章分类

全部博文(20)

文章存档

2018年(2)

2012年(1)

2011年(4)

2010年(5)

2009年(2)

2008年(6)

我的朋友

分类: LINUX

2018-12-29 13:46:40

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]


阅读(2588) | 评论(0) | 转发(0) |
0

上一篇:DNS 解析编程实例

下一篇:Linux Diff and Patch

给主人留下些什么吧!~~
评论热议
请登录后评论。

登录 注册