将文件从一个分支合并到Clearcase中的另一个分支 [英] Merge file from one barnch to another branch in Clearcase

问题描述

我想在一个文件中将文件从一个分支合并到另一个分支，
例如从Offshore分支到DEV分支.

I want to merge a file from one branch to another branch in clearcase,
for example from Offshore branch to DEV branch.

我想按原样合并文件及其修改时间.

I want to merge the file with its modification time as it is.

如果文件(example.asp)的修改日期是12-02-2011，则在合并DEV分支中的文件后，DEV分支中文件(example.asp)的修改时间应保持相同修改时间(12-02-2011).

If the modification date of a file (example.asp) is 12-02-2011, after merging the file in DEV branch, the modification time for the file (example.asp) in DEV branch should hold the same modification time (12-02-2011).

我应该采取哪种观点?
我应该如何合并?

Which view should I take?
how should I do merge?

注意:在合并过程中签入和签出时，我尝试过 保留修改时间 选项.

Note: I tried preserve modification time option while checkin and checkout during merging.

推荐答案

视图很简单:合并时，请始终在目标视图中进行操作，即在包含合并目标版本的视图中进行操作.

The view is easy: when merging, always do so in the destination view, ie in the view which contains the destination version of your merge.

从那里，您可以显示该文件的版本树，并查找源版本"(要合并的版本，在您的情况下，是离岸分支的版本).

From there, you can display the version tree of that file, and look for the "source version" (the one from which you want to merge, in your case, the one on Offshore branch).

您可以右键单击源版本，然后选择合并到"，然后选择目标版本(由眼睛"指定的版本).
ClearCase会询问您是否要检出该文件(例如，是)并执行合并(但不会检入文件).

You can right click on the source version and select "Merge to", and then the destination version (the one designated by an "eye").
ClearCase will ask you if you want to checkout that file (say yes) and will perform the merge (but will not checkin the file).

然后您可以检查保留修改时间"是否适用于您的情况.

You can then check if the "preserve modification time" applies in your case.

这篇关于将文件从一个分支合并到Clearcase中的另一个分支的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！