ClearCase：两个分支中的文件相互隐藏 [英] ClearCase: Files in 2 branches obscure each other
问题描述
我在两个不同的分支（例如，开发和发布）中检查过两次相同的文件（文件名）。
这个打破了任何东西，所以我想取1个版本并正确地复制/合并到另一个分支，以后手动（从备份）合并丢失的更改。那么我会失去一个文件的历史，但至少2个文件将被连接。
如何做？
另外请注意，由于连接断开，所以在做版本树的时候，我不能仅仅是这两个文件具有不同的版本树。 （这是不是在1版本树中的不同的文件2视图，就像是正常的/正确的情况。）
另外，我认为问题是与文件夹有一些这种类型的引用2个不同的文件，但不知何故，我不能编辑的文件夹？！
href =http://www-01.ibm.com/support/docview.wss?rs=984&uid=swg21125072 =nofollow noreferrer>邪恶双胞胎（也描述了 SO问题）
（
$ b
- 从另一个分支（rmname）中删除文件，
- 和合并。
合并将在另一个分支中添加相同的文件。
该进程（ rmname + merge ）在> Clearcase：如何合并在一个特定的文件从一个视图，到另一个，以避免邪恶的双胞胎情况？ a>
（由Andreas编辑）
您的解决方案效果很好，因为我注意到我有一个具体的情况：
文件坏了，因为别人重命名了它...所以它不是像你的解决方案一样简单，但我必须手工 ，
转到 X：\FullyQualifiedPath （VOB中的正确路径）
使用：
cleartool ln FullyQualifiedName ./FileName
其中 FullyQualifiedName 就是您得到它的名字。 G。从版本树中，当你说发送到 - >复制（类似于 //查看，之前放置文件：）。这将创建链接。
之后，您可以再次在ClearCase Explorer中看到所需版本。
I have checked in the same file (filename) twice in 2 different branches (say, development and release).
This breaks just about anything, so I want to take 1 version and "properly" copy/merge it to the other branch, later merging in the lost changes manually (from a backup). Then I would lose history for 1 file but at least the 2 files would be connected again.
How to do it?
Also note, since the connection is broken, I cannot mere, also, when doing a Version Tree, both files have different version trees. (It is not 2 views at different files in 1 Version Tree, like is the normal/correct case.)
Also, I assume the problem is with the folder having some kind of a reference to 2 different files, but somehow, I cannot edit the folder?!
Those are call "evil twins" (also described in that SO question)
(one less thing to worry with Git ;) )
The easiest way is to pick one branch:
- remove the file from the other branch (rmname),
- and to the merge.
The merge will add that same file in the other branch.
That process (rmname + merge) is illustrated in "Clearcase: How do I merge in a specific file from one view, into another, to avoid the Evil Twin scenario?"
(edit by Andreas)
Your solution worked great, I changed it for me since I noticed I have a specific case:
The file got bad since someone else renamed it... so it was not just as simple as your solution, but I had to do it "by hand", as is
Go to X:\FullyQualifiedPath (correct path in VOB)
Use:
cleartool ln FullyQualifiedName ./FileName
where FullyQualifiedName is the name as you get it e. g. from VersionTree when you say "Send To -> Copy" (something like //view, drop the file: before). This creates the link
Afterwards, you can see the desired version in the ClearCase Explorer again.
这篇关于ClearCase：两个分支中的文件相互隐藏的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
