ClearCase：当使用clearfsimport执行重置合并时，如何防止其创建邪恶的双胞胎？ [英] ClearCase: When using clearfsimport to perform a reset merge, how can I keep it from creating evil twins?
问题描述
我有与此处发布的问题相同的问题：
I had the same question as posted here:
Cleartool findmerge在所有情况下默认情况下是从文件2中选择更改吗？
我尝试了建议的修复程序（从源视图到目标视图执行clearfsimport）。我这样做的方法是（在Linux上）设置目标的动态视图，将其cd放入VOB标记中，然后使用 / view / [source_viewname] / [vobname] / * 作为 clearfsimport 的来源。问题在于它试图制造邪恶的双胞胎，这对情况没有帮助。
I tried the recommended fix (performing a clearfsimport from the source view to the destination view). I did this by (on Linux) setting a dynamic view for the destination, cd-ing into the VOB tag, then using /view/[source_viewname]/[vobname]/* as the source for the clearfsimport. The problem with this is that it attempts to create evil twins, which doesn't help the situation.
还有其他方法可以解决原始问题吗？
Are there any other ways of doing what's being asked in the original question posted above?
推荐答案
您可以尝试混合方法：
- 按照建议使用
findmerge -ftag -merge -abort：应该至少合并文件夹。 - 对于存在冲突的每个文件夹，请使用clearfsimport。
- use
findmerge -ftag -merge -abort, as suggested: that should at least merge the folders. - for each folder where there is a conflict, use clearfsimport.
避免出现任何邪恶双胞胎的关键是确保文件夹首先合并（将为该文件夹的文件创建条目）。
然后 clearfsimport 不会尝试创建新文件，但是
The key, to avoid any evil twin, is to make sure the folder is merged first (that will create entries for the files of that folder).
Then the clearfsimport won't try to create new files, but will update those entries, avoiding the evil twins.
我想我会请执行以下操作：
I think I'll do the following:
findmerge -type d -abort 在第一次通过时，让手动合并失败
findmerge -type d -exec ct合并（手动合并源中的元素）
findmerge -type d -abort on the first pass, let manual merges fail
findmerge -type d -exec "ct merge (manually merge the element from source)"
findmerge -type f -abort 在此过程中，让手动合并失败
findmegre -type f -exec ct merge（手动合并源中的元素）
findmerge -type f -abort on this pass, let manual merges fail
findmegre -type f -exec "ct merge (manually merge the element from source)"
这是正确的计划：首先合并文件夹，然后合并文件。这样，就不会有邪恶的双胞胎了。
That is the right plan: first merge folders, then files. That way, no evil twins.
这篇关于ClearCase：当使用clearfsimport执行重置合并时，如何防止其创建邪恶的双胞胎？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
