http://blog.csdn.net/sanshiqiduer/article/details/2423936

CVS Branch 和 Merge 在 Eclipse 中的使用
Branch：
我们在version Release_1_0建立一个branch,比如叫做“Release_1_0_Branch”, 这时CVS会同时建立一个regular tag “Root_of_Releas_1_0_Branch”，这个“Root_of_Releas_1_0_Branch” tag的用途是为了以后branch 合并到main trunk时提供一个参考点。
之后开发新版本的人员就基于main trunk工作，而fix bug的人员就基于Release_1_0_Branch工作。
一旦在Release_1_0_Branch上将Release_1_0的bug修复了，我们就可以将Release_1_0_Branch合并到main trunk中来，从而一次性remove the bugs。

Merge：
fix bug之后，这时我们要把 Brank  merge main trunk 了。
1、选择 project -> Right click your project name, choose Replace With > Another Branch or Version from the context menu,
 Then select the HEAD to replace with your current version in your workplace。
2、Select the project and choose Team > Merge.
在随后出现的对话框中，你首先选择regular tag ”Root_of_Releas_1_0_Branch”，然后在下一步中选择你的Branch“Release_1_0_Branch”。
3、Synchronize view中的操作
在第二步结束后，Synchronize view中将显示“all the differences between the branch and your workspace version(that is the HEAD version)”,你必须在Synchronize view中通过菜单中提供的“Update, Override and Update, or Mark as Merged”手工决定合并到你工作区的change。

4、在所有期望的changes都被merge到你的工作区后，你就可以“commit”the changes to the repository了。

=============================

http://help.eclipse.org/juno/index.jsp?topic=%2Forg.eclipse.platform.doc.user%2Ftasks%2Ftasks-100b.htm

Merging from a branch

After creating and working in a CVS branch for some time, you may want to merge your changes from the branch into another branch, or into HEAD. To do this, you will need to know:

  1. The name of the branch or version that contains your changes.
  2. The version from which the branch was created. This is the version name that you supplied when branching.

To merge your changes:

  1. Ensure that the destination is loaded into your workspace. For example, if you wish to merge your changes into HEAD, make sure the project is shared with HEAD in your workspace. To do this, select the project and choose Replace With > Another Branch or Version from the context menu. Then select the branch to replace with.
  2. Select the project and choose Team > Merge.
  3. Enter the branch or version which contains the changes you want to merge.
  4. The merge dialog will try to guess an appropriate start point. If that fails, enter the start point of the merge. This is the version from which the branch was created. Click Finish.
  5. A CVS Merge synchronization will be added to the Synchronize view, showing all differences between your workspace and the branch with the changes.
  6. Load all of the desired changes into the workspace. This may be accomplished by either manually merging changes, or by choosing Update, Override and Update, or Mark as Merged from the tree's context menu.
  7. After all desired changes are in the workspace, choose Team > Synchronize with Repository. You may then commit all the changes to the repository.

Tip: If you don't know the start point of the merge, you can choose to perform the merge directly into the workspace. This relies on the CVS server to pick an appropriate start point. Because the merge is performed directly into the workspace, CVS may introduce a text based conflict markup into the file. This markup is typically hard to deal with so merging directly into the workspace should only be done when necessary.

Merge actions

The actions in the merge editor complement the manual merge toolbar actions that are available in the bottom half of the merge editor.

Merge Running this action will bring the changes into the file in the workspace. Any conflicts that are not auto-mergeable will be skipped.
Override and Update This action is enabled on files with conflicting changes. Running this action will discard any local changes you have and replace the file with the remote contents.
Mark as Merged This action will remove the selected changes from the view. The changes will only reappear if the remote state of the resource changes and the CVS Merge Synchronization is refreshed.

Tip: You can perform ongoing merges by pinning a CVS Merge Synchronization in the Synchronize view. This will allow you to keep your workspace up-to-date with the changes released to a different branch.

CVS Branch 和 Merge 在 Eclipse 中的使用相关推荐

  1. Eclipse中的Git使用之Branch创建，Merge

    目录 ■操作步骤 1.创建 Branch 2.merge代码 (Barnch_A ← Branch_B) ■默认注释 ■其他 ■竞合发生时(会显示竞合文件一览) ■关于竞合的代码 ■[Stage 区域 ...

  2. Eclipse中CVS界面功能描述 (二)

    原文地址:http://www.cnblogs.com/aijava/archive/2009/08/28/2191848.html 5.4.3 CVS Annotate视图 CVS Annotate ...

  3. Eclipse中CVS界面功能描述（一）

    原文地址:http://www.cnblogs.com/aijava/archive/2009/08/28/2191849.html Eclipse中的CVS用户界面 现在,您已经对CVS有了一个基本 ...

  4. Eclipse中CVS版本管理

    Eclipse中CVS版本管理 1.1 CVS简介 CVS是Concurrent Versions System(并发版本系统)的简称.它是一个开放源代码的项目,是当前最流行的版本控制系统,目前绝大部 ...

  5. Eclipse中CVS界面功能描述 (三)

    原文地址:http://www.cnblogs.com/aijava/archive/2009/08/28/2191847.html 5.4.9 处理同一文件的并发更新 首先,我们讨论一下一个被建议用 ...

  6. 如何在eclipse中使用分支合并功能

    我们的项目在某一阶段通常会发布一个版本,供客户进行使用,然后我们会继续开发下一个版本,如果这时候客户正在使用的那个版本发现了bug,我们当然需要更改bug,并且给客户发布更新补丁包.这时就需要创建基本 ...

  7. eclipse中git的使用----EGIT插件

    一_安装EGIT插件 http://download.eclipse.org/egit/updates/ 或者使用Eclipse Marketplace,搜索EGit 二_使用EGIT前的配置 配置个 ...

  8. git在eclipse中的配置 转载

    git在eclipse中的配置 转载 一_安装EGIT插件 http://download.eclipse.org/egit/updates/ 或者使用Eclipse Marketplace,搜索EG ...

  9. eclipse git 取远程代码_【JAVA】Eclipse中使用git进行pull远程代码

    当使用eclipse或者MyEclipse进行pull远程代码的时候,或者github的代码的时候报如下错误代码: 代表我们没有配置我们的Git地址,这里我教大家配置一下.首先下面是错误代码: The ...

最新文章

  1. （DML触发器）如何正确理解触发器的deleted表和inserted表（转）
  2. FS,FT,DFT,DFS和DTFT的关系
  3. HTML单元格怎么加单元格,如何根据其值在HTML单元格中添加类
  4. mysql修改存储引擎报错_修改mysql存储引擎备份数据库报错及解决方案
  5. C语言标准库＜limits.h＞
  6. javasript ide
  7. 社会工程学之《反欺骗的艺术》小结（二）
  8. 教你如何零基础备考公务员
  9. 关于Lattic Diamond软件安装不成功问题（license问题）
  10. 【测试面试题每日一刷】22道接口测试面试题，附答案
  11. linux佳能打印机驱动下载,佳能lbp2900打印机驱动下载
  12. Word批量调整插入图片大小
  13. 数显之家快讯：【SHIO世硕心语】古有《陋室铭》，现有《群之铭》！
  14. 使用Intellij来实践测试驱动开发 TDD Kata
  15. 基于ASP.NET的图书在线销售管理系统设计与实现
  16. 携程网不能访问的真相曝光
  17. 阿里acp认证是什么 阿里acp认证含金量高吗
  18. input框的输入事件
  19. 洛谷P1010 [NOIP1998 普及组] 幂次方 C语言/C++
  20. Linux中对lvm逻辑卷的管理

热门文章

  1. LeetCode Algorithm 543. 二叉树的直径
  2. 112. Path Sum 路径总和
  3. 如何让你瞬间拥有百万粉丝 前端F12的那些装X小技巧
  4. swing打地鼠游戏_【亲子早教】9月早教亲子游戏
  5. python mq_RabbitMQPython
  6. 自己的总结（你必须知道的C 495个问题）
  7. file是c语言自带的数据类型吗_C语言中基本的数据类型包括
  8. java（6）——+号和++号--号
  9. 旋转数组—leetcode189
  10. java 队列已满_java – ThreadPoolExecutor当队列已满时阻塞？