solution for clearcase evil twins?

前端 未结 1 829
自闭症患者
自闭症患者 2020-12-20 03:23

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

相关标签:
1条回答
  • 2020-12-20 04:07

    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.

    I prefer rmname instead of rename, as shown in "Clearcase: How do I merge in a specific file from one view, into another, to avoid the Evil Twin scenario?".

    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.

    See more with "When clearcase “evil twins” will be created and how to avoid it?".


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

    0 讨论(0)
提交回复
热议问题