提供自动合并(deliver merge automatic)

我的要求是关于ClearCase的交付：我要自动交付（无人工干预/无故障交付）工艺：在传递 - 如果有任何合并的问题1.如果CC能够合并文件，它的睦邻让它合并，2 。如果CC是不能合并 - 我不希望它失败了，反而让不合并特定的文件（恢复合并该文件），旁边的文件进行。 3.List被跳过，这样我可以手动合并后的文件。

我怀疑，我们可以在一个步骤做到这一点，但让我知道这是可能的，而且过程中做到这一点。

Answer 1:

you can click "skip all" during a merge, but you will have to resolve them in one way or another.
The easiest way is to make sure those files aren't considered for merge in the first place (see below).

But there is no native way to automate the process you describe:

While delivering, if there is any merge issue

if CC is able to merge files let it merge,

if CC is not able to merge - I don't want it to fail, instead lets not merge that particular file (revert merge for that file), proceed with next files.

List the files that are skipped, so that i can manually merge later.

You would need to write a script to manage those case, and even in this case it wouldn't work for an UCM merge (deliver/rebase), which won't complete until all files have been merged (hence my "red arrow" suggestion below)

That script would basically take the output of a cleartool findmerge -print (to get all directories/ files to merge), and then merge first the directories, and then the files one by one, applying the policies your are afer.

for making sure a certain file is always ignored

for the current merge:
You can simulate the merge by displaying the version tree and right click on the source version: "merge to" and select "do not merge, draw the merge arrow" (red arrow, which represents a merge arrow, as seen in this illustration).
The idea is to trick the current deliver into believing that this file has been merged even though you haven't do any modification during that merge (you just have drawn the red or merge arrow between the source and destination version).
for the future merges:
You can change the merge manager associated to a type of file in order to never merge it.
See "Handling Binary Files in IBM Rational ClearCase", which explains how to create a new special type manager:

You can then apply that merge manager to a specific file with cleartool chtype.

Answer 2:

起初我想下面的命令来获取文件合并列表（文件名，活动更名为避免混乱）：

cleartool findmerge活性：A @ \ a_pvob活性：B @ \ a_pvob -fcsets -ftag Accept_deliver_stream型d -merge -log C：\ TEMP \ am.log

cleartool findmerge活性：A @ \ a_pvob活性：B @ \ a_pvob -fcsets -ftag Accept_deliver_stream型的F -print -log C：\ TEMP \ af.log

所以它返回的命令af.log文件的列表中，当我试图执行这些命令，它只是挂起，甚至一小时后，一个命令是：

cleartool findmerge M：\ WM2011_DEV_INTG_WMOSBUILD_01 \ WM08 \ CPP \基\基础\一般\ invupdates \ InvUpdate.cpp -fver \主\ Mainline_Int \ WM08_Integration \ WM09_Integration \ WM2010_DEV_INTG \ MAIN_WM_Int \ WM2012_IND \ 9 -log NUL -merge -cqe

文章来源: deliver merge automatic