在所有情况下，默认情况下Cleartool findmerge选择文件2的更改？ [英] Cleartool findmerge select changes from file 2 by default in all cases?

问题描述

所以我有一个分支，与世界其他地方相比，它已经过时了。我很想简单地创建一个新分支并合并...但是这个任务会更大...无论如何，我想找出的是是否可以设置 findmerge 始终接受文件2。为加快合并速度，我最初做了以下操作：

So I have a branch is that is dreadfully out of date with the rest of the world. I'd love to simply create a new branch and merge over... but that task would be even larger... anyways what I'm trying to figure out is if I can set findmerge to always accept file 2. To speed my merge up, I initially did:

cleartool findmerge <path to out of date code> -ftag <my merge from view> -merge -abort

涵盖所有简单的合并，但我不想抓住冲突的更改，但我真的只想从文件2中进行所有更改。

to cover all the simple merges, but not I want to grab the 'conflicting' changes, but I really just want all changes from from 'file 2'.

有没有简单的方法或标志可以提供给 findmerge 来做到这一点？

还是我必须逐个文件地逐个选择每个更改？

Is there an easy way or flag to provide to findmerge to do that?
Or do I have to go file by file and choose each change individually?

最后，我想要一个分支，它具有指定文件夹的确切位置，该分支完全来自于区域合并。

At the end of the day, I want what is an branch that has for a specified folder what is exactly in the merge from area.

我猜答案是否，但我有希望，我的数字已经厌倦了按回车键：-）

I'm guessing the answer is 'no' but I have hope, and my figures are getting tired of pressing the return key :-)

推荐答案

对于这种重置合并，您希望一个分支内容（合并后）镜像该合并源的内容（ 2 ），我根本不使用findmerge。

For that kind of "reset" merge, where you want one branch content to (after merge) mirror the content of the source of that merge (2), I don't use findmerge at all.

我设置了一个活动（如果我使用的是UCM），并且启动了 clearfsimport ，以便将数据从源视图导入到目标视图。

I set an activity (if I am on UCM), and I initiate a clearfsimport in order to import data from the source view to the destination view.

然后，我在源视图的任何可见版本与其目标视图中的匹配元素之间创建合并箭头（如 完成私有ClearCase分支时如何忽略文件？或 在ClearCase中合并箭头-即红色合并箭头--也用于 如何执行在ClearCase VOB中进行二进制文件的简单合并）

I then create merge arrows between any visible version of the source view and their matching element in the destination view (as in "how to ignore files when finishing private ClearCase branch?", or "Merge arrow in ClearCase" -- that is the red merge arrow --, also used in "How to perform a trivial merge of a binary file in a ClearCase VOB")

cleartool merge -ndata -to aFile -version /main/a/SourceVersion /main/a/DestVersion

这样，一个源分支已被合并到目标，并且源内容已复制到目标视图内容上。

That way, one source branch has been merged to the destination, and the source content has been copied over the destination view content.

这篇关于在所有情况下，默认情况下Cleartool findmerge选择文件2的更改？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！