如何在Clearcase中合并新版本和旧版本文件 [英] How to merge new version and old version file in clearcase
问题描述
假设我已经从主行检出文件 file.c
。在该文件中,假设只有一个函数说 add()
。
Let say I have checked out a file "file.c
" from main line. In that file suppose there is only one function say "add()
".
我要实现一个该文件中的更多功能说 subtract()
,因为我签出了文件,并实现了 subtract()$ c $ c>函数。
I am going to implement one more function in that file say "subtract()
" for that I checked out the file and I've implemented "subtract()
" function.
现在,假设另一个人在同一个文件中实现了一个新函数,说 multiply()
,他将文件检入主行,并在主行中为该文件创建新版本。
Now, suppose in the same file another person implemented a new function say "multiply()
" and he check in that file to main line and the new version is created for that file in the main line.
我的问题是:我在在我的活动分支中签出的ve有两个函数,一个是 add()
,而其中一个函数是 subtract()
由我实施。
My question is: the file which I've checked out in my activity branch is having two function one is "add()
" which was already there and one function is "subtract()
" which is implemented by me.
我想要文件中的第三个功能,即 multiply()
,而不会影响我的活动分支中的更改。我不想签入主行,只想在已签出的文件中全部使用三个函数。
所以我的文件将包含三个函数 add()
, subtract()
和 multiply()
。
I want the third function i.e. "multiply()
" in my file without affecting my changes in my activity branch. I don't want to do check in to the main line, just I want all three functions in my checked out file.
So my file will contain three functions add()
, subtract()
, and multiply()
.
如何做到这一点(无需检查即可触发mergetool)?
How can I do that (without a checking triggering the mergetool)?
推荐答案
最简单的方法是到:
- 具有单独的动态视图,该视图始终反映最新的动态视图(包括其中包含乘法的文件)
- 将该文件的感兴趣部分简单地复制粘贴到已签出的文件中
如果需要手动复制的更改太多,请使用差异工具,以便从动态视图和当前视图中的视图中检测出文件之间的变化。
If there are too many change to copy manually, use a diff tool in order to detect changes between the file from the dynamic view and the one in your view, currently checked out.
这篇关于如何在Clearcase中合并新版本和旧版本文件的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!