ClearCase:交付和重新定基之间的区别 [英] ClearCase: Difference between delivering and rebasing

问题描述

假设流B和流C是流A的子流，并且从A的相同基准开始播种.在B和C并行开发一段时间后，B需要从C的最新基准bl_C_5获得代码.以下操作之间是否存在功能性(元素合并)或非功能性(性能等)差异?

Suppose stream B and stream C are child streams of stream A and seeded from the same baseline of A. After parallel development for a while in both B and C, B needs to obtain the codes from the latest baseline bl_C_5 of C. Is there any functional (merging of elements) or non-functional (performance etc.) difference between the following operations?

• B从C的基线bl_C_5开始重新定位
• C向B传递基线bl_C_5

推荐答案

简单:

" B 从基准 C 的基线 bl_C_5 重新设定基准"是不可能的:重新设定基准只能合并从父流产生的基准A ，而不是 C .

"B rebases from baseline bl_C_5 of C" is impossible: a rebase can only merge baseline produced from the parent Stream A, not from C.

您可以将 C 交付给 A ，在 A 上设置基准，并在 B 上重新设置基准.

You could deliver C to A, set a baseline on A and rebase said baseline on B.

然后直接将 C 传递到 B (可能)的区别在于，重新定位将带来潜在的其他更改传递给 A .
如果没有在 A 上进行其他合并(传递/重新设置基准)，则将 C 传递到 A ，然后重新构建 B 与直接传递到 B 相同.唯一的区别是，在 A 上的所有视图都将看到 C 贡献.

Then the difference with delivering directly C to B (which is possible) would be that the rebase would bring potential other changes delivered to A.
If no other merge (deliver/rebase) has taken place on A, the deliver C to A, and then rebase B is the same than delivering directly to B. The only difference is that all views on A would see C contributions.

这篇关于ClearCase:交付和重新定基之间的区别的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！