注册 登录  
 加关注
   显示下一条  |  关闭
温馨提示!由于新浪微博认证机制调整,您的新浪微博帐号绑定已过期,请重新绑定!立即重新绑定新浪微博》  |  关闭

中吴南顾惟一笑

成功法则就是那19个字

 
 
 

日志

 
 

ClearCase Tips  

2010-09-10 19:51:58|  分类: R&D |  标签: |举报 |字号 订阅

  下载LOFTER 我的照片书  |
View an activity’s change set

Compare with Change Set Predecessor -- compares the version with a previous version that came before any versions in this change set
1. Right-click an activity in ClearCase Explorer to access its properties
2. Click the Unified Change Management tab to see the activity’s change set
3. Right-click an element
4. Select Compare with Change Set Predecessor


Before Delivering Activities:
1. Check In Versions
2. Rebase Your Stream
3. Select the activities you want to deliver (Checking Activity Dependencies)


Diff Merge Tool
----------------------
|   Merge Results    |
----------------------
| Base | From |  To  |
----------------------

The base contributor is the closest common ancestor of the contributors(original version).
The target contributor(or To-version) is the latest version in the stream that will contain the results of the merge.
The source contributor(or From-version) is the version in your development view that you are delivering from.
The merge output file contains the results of the merge. It is usually checked out as a successor to the target contributor.


Merge Algebra
 BaseFrom
To Result
 A
 A
 A
 A
 B 
  (Deleted) B  (Deleted)
 C C Z(Changed) Z(Changed)
   X(Inserted)
   X(Inserted)
 D  R(Changed) Q(Changed)  ?(Conflict)
  评论这张
 
阅读(95)| 评论(0)
推荐 转载

历史上的今天

在LOFTER的更多文章

评论

<#--最新日志,群博日志--> <#--推荐日志--> <#--引用记录--> <#--博主推荐--> <#--随机阅读--> <#--首页推荐--> <#--历史上的今天--> <#--被推荐日志--> <#--上一篇,下一篇--> <#-- 热度 --> <#-- 网易新闻广告 --> <#--右边模块结构--> <#--评论模块结构--> <#--引用模块结构--> <#--博主发起的投票-->
 
 
 
 
 
 
 
 
 
 
 
 
 
 

页脚

网易公司版权所有 ©1997-2017