如何将来自特定UCM活动的更改从一个ClearCase流合并到另一个 [英] How to merge changes from a specific UCM activity from one ClearCase stream to another

问题描述

从理论上讲，这应该很简单，即将特定UCM活动的更改从一个流合并到另一个流。

This should in theory be quite simple, i.e. merge the changes from a specific UCM activity from one stream to another.

我曾经以为我可以在GUI中使用传递命令，然后仅选择要传递的活动，但是似乎目标流设置为不允许从其他流传递。

I had thought that I might just be able to use the Deliver command in the GUI and then select just the required activity to deliver, but it seems that the target stream is set to not allow deliveries from other streams.

通过搜索文档，看来我也许可以使用 findmerge 工具通过命令行来执行此操作，但是从相对稀疏的文档中并不清楚做这个。看来这可能是一个两阶段的过程，即首先生成一个变更集，然后合并该变更集？另外，我想为每个受影响的文件手动进行合并，因此，如果可能，我将需要调用图形合并工具。

From searching the documentation it seems that I might instead be able to do this via the command line using the findmerge tool, but it's not at all clear from the rather sparse documentation how you do this. It seems like it might be a two stage process, i.e. first generate a "changeset", then merge that changeset ? Also I'd like to do the merge manually for each affected file, so I would need the graphical merge tool to be invoked if possible.

如果有人可以给我一个示例 findmerge +用于合并活动的任何命令行，这将是一个很好的开始。也欢迎任何其他有关合并活动的建议。

If someone can give me an example findmerge + whatever command line for merging an activity that would be a great start. Also any other suggestions for how to merge an activity would be welcome.

推荐答案

首先，通常使用UCM交付交付所有活动。

您可以尝试仅交付一个子集，但是您很快就会陷入时间轴的束缚，因为时间轴人为地将所有活动链接在一起，从而迫使您在下一次交付时交付它们（全部）。

First, deliver in UCM are (usually) made to deliver all activities.
You can try to deliver only a subset, but you quickly comes to gripe with "timeline", which are linked artificially all the activities together, forcing you at the next deliver to deliver them (all).

findmerge 工具，但它不在相当稀疏的文档都清楚您如何执行此操作。看来这可能是一个两阶段的过程，即首先生成一个变更集。然后合并该变更集？

findmerge tool, but it's not at all clear from the rather sparse documentation how you do this. It seems like it might be a two stage process, i.e. first generate a "changeset" then merge that changeset ?

cleartool findmerge活动： 是非UCM将活动引用的所有版本从流（实际上是这里的一个分支）合并到另一个分支的方法。

cleartool findmerge activity: is the non-UCM way to merge all versions referenced by an activity from a stream (a branch actually here) to another branch.

ct findmerge activity:A1@\pvob activity:A3@\pvob -fcsets -c "report for delivery" -merge -gmerge

请参见" ClearCase：用旧的基准活动创建新的基准有关时间轴（活动相关性）和 findmerge 的更多信息。

See "ClearCase : Making new baseline with old baseline activities" for more on timeline (activity dependencies) and findmerge.

这在技术说明swg21267316 ：

从目标视图：

From the target view:

设置为活动（ setact ）或创建一个新活动（ mkact ）。此活动就像交付期间通常使用/创建的集成活动一样。它允许您：

Set to an activity (setact) or create a new activity (mkact). This activity is just like the Integration activity normally used/created during a deliver. It allows you to:

• 在合并后检查文件。


• 使用以下格式运行findmerge：
  cleartool findmerge活动选择器... -fcsets [-gmerge | -merge]


• 根据需要合并文件


• 已合并的签入文件


• check the files in after the merge.
• Run a findmerge using the following format:
  cleartool findmerge activity-selector ... -fcsets [-gmerge | -merge]
• Merge files as needed
• Checkin files that were merged

示例：

M:\int\cvob1>cleartool findmerge activity:A@\pvob -fcsets -gmerge
Needs Merge "M:\int\cvob1\old folder\new name" [to \main\int\7 from \main\int\de
v\2 base \main\int\dev\1]
Checkout comments for this and any additional elements:
deliver dependencies work around
.
Checked out "M:\int\cvob1\old folder\new name" from version "\main\int\7".
  Attached activities:
    activity:int-merge@\pvob  "int-merge" 

这篇关于如何将来自特定UCM活动的更改从一个ClearCase流合并到另一个的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！