Clearcase：如何避免一个视图将特定文件从一个视图合并到另一个视图，以避免Evil Twin场景？ [英] Clearcase: How do I merge in a specific file from one view, into another, to avoid the Evil Twin scenario?

问题描述

我有一个文件需要带到另一个分支。如何从命令行执行此操作。似乎所有内容都适合合并，文件在两个分支中都已经存在。

I have a file that needs to be brought into a different branch. How do I do this from the command line. Everything seems to be geared to merging, where the file already exists in both branches.

推荐答案

我再也无法访问clearcase环境，所以这是从内存中获取的，但是您想要的是将另一个分支中的版本链接到您正在使用的分支中。

I no longer have access to a clearcase environment, so this is from memory, but what you want is to link in a version from another branch into the one that you are working with.

让我们假设您拥有已在分支 new_feature 分支上添加的文件 new_file （最新版本为 new_file @ @ / main / new_feature / 5 ）要合并/合并到分支维护。

Let's assume that you have a file new_file that have been added on the branch new_feature (the latest version is new_file@@/main/new_feature/5) which you want to merge/bring into the branch maintenance.

prompt>cleartool checkout -nc .
checking out some_dir@@/main/maintenance/2
...
prompt>cleartool ln .@@/main/new_feature/LATEST/new_file/main/new_feature/5 .
...
prompt>cleartool ci -c "linked in .@@/main/new_feature/LATEST/new_file/main/new_feature/5"
prompt>

上面的命令可能不是100％正确的，但应该可以给您带来启发。您想使用 cleartool ln 来避免邪恶的双胞胎，因为这将从现有元素中引入一个版本（即不创建新的双胞胎）。

The commands above are probably not 100% correct, but should give you the idea. You want to use cleartool ln to avoid evil twins, because that will bring in a version from the already existing element (i.e. not creating a new twin).

这篇关于Clearcase：如何避免一个视图将特定文件从一个视图合并到另一个视图，以避免Evil Twin场景？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！