清除邪恶的双胞胎的解决方案? [英] solution for clearcase evil twins?

问题描述

我对ClearCase合并有一个问题:我执行的是"add to source control"(将文件从一个分支合并到我的分支)，而不是文件的ClearCase合并.

I have an issue with ClearCase merge: Instead of a ClearCase merge for a file, I have performed "add to source control" (merging a file from one branch to my branch).

现在我没有版本历史记录，也看不到从源分支到我的合并箭头.
Google之后，我发现我的问题是"邪恶双胞胎".
实际上，我不知道如果该分支已经存在，则不应该将该文件添加到分支中.

Now I don't get the version history and I am not able to see merge arrow from source branch to mine.
After google it, I found that my problem is "evil twins".
Actually I am unaware of that the file should not have been added to a branch if same one already exists.

许多论坛都说我可以通过重命名文件来解决它.
但是，有一个问题，引起问题的文件被合并到其他新分支中.
如果我重命名文件，此更改在其他相关分支中是否会导致任何问题?他们会放开档案吗?

Many forum say I can fix it by renaming the file.
But, there is a problem, the file which got the issue was merged to other new branches.
If I rename the file, does this change make any problem in other related branches? Do they loose their file?

您将建议如何解决此问题?

What would you recommend to fix this issue?

推荐答案

"

The rename which is suggested in "About Evil Twins" affects only the current version of the parent folder: after the rename, a version tree of the parent folder would show a new version, which list the same file under a new name.

这意味着其他分支仍然会显示具有旧名称的文件(这意味着它们仍然是邪恶的双胞胎).

That means the other branches would still show that file with the old name (which means they are still evil twins).

您需要将在其中进行了重命名的分支合并到其他分支(先前已合并文件的分支)中，以便传播该重命名.

You would need to merge the branch in which you did the rename to the other branches (where the file was previously merged) in order to propagate that rename.

我首选rmname而不是重命名，如"明确的案例:如何将特定文件从一个视图合并到另一个视图，以避免Evil Twin场景?".

最后，您需要将具有实际文件的分支(具有历史记录的分支)合并到创建邪恶双胞胎的分支(您在其中添加了具有相同名称且没有历史记录的文件的源代码控制)，为了使用正确的元素.

Finally, you would need to merge the branch with the actual file (the one with an history) to the branch where you created the evil twin (where you added to source control the file with the same name and no history), in order to use the right element.

通过"何时创建透明表壳邪恶双胞胎"以及如何避免这种情况来了解更多信息.".

您还可以检查是否没有其他邪恶的双胞胎("在Rational中检测邪恶的双胞胎"最简单的方法是什么ClearCase?)

You can also check if you haven't any other evil twins ("What's the easiet way to detect "evil twins" in Rational ClearCase?")

这篇关于清除邪恶的双胞胎的解决方案?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！