ClearCase洋文翻译-rebase（变基）

英文：地址

 

扩展阅读文档：地址

 

rebase（变基）

Changes the configuration of a stream（修改流的配置）

 

Description（描述）

The rebase command reconfigures a stream by adding, dropping, or replacing one or more of the stream's foundation baselines . The file and directory versions selected by those new baselines (and thus their associated activities) then become visible in the stream's views.

变基通过添加，放弃，替换一个或者多个流的基础基线来重配置流。这些新基线选择的文件和目录版本（和相关的活动）会在流的视图里面可见

Only labeled baselines can serve as foundation baselines.
只有被标签过的基线才能被用作基础基线

Any changes made in the stream before a rebase operation are preserved during the rebase. For any file modified in the stream, rebase merges any changes that are present in versions of that file in the new foundation baselines into the latest version of that file in the stream, thereby creating a new version. All such merged versions are captured in the change set of an integration activity that rebase creates. This integration activity becomes the view's current activity until the rebase operation is completed or canceled.
在一个变基操作之前流里面做的一些变化都在变基的过程中保护起来（就是不能够变）。

对于流中发生变更的任意文件，变基是在基础基线的最新文件版本上进行进行变更版本归并的，因此会形成新的版本。

所有这类的归并版本都会记录在变更操作时产生的一个集成活动的变更集中。这个集成活动变成视图的当前活动直到变集操作结束或者取消。

（基线不能够改变，变基归并变更内容后的版本就是新的基础基线的最新版本）

You must perform a rebase operation in a view belonging to the stream that is being rebased. Before starting the rebase operation, it is good practice to check in all files in that view. By default, the rebase operation stops when it encounters a checkout conflict. However, for a project or a stream enabled with the POLICY_REBASE_CO policy, and for single stream project, rebase skips the checked-out file and continue with other files.

你必须在属于已经变基流的一个视图中执行变基操作，在开始变基操作之前，你最好检入视图中所有的文件，通常，当它遇到一个检出冲突时候，变基会停止。但是，当一个项目或者一个流开启了规则POLICY_REBASE_CO，并且是单流项目，变基将会跳过检出的文件，继续在其他文件中进行变基。

（变基操作前，最好检入所有文件）

 

If you want to recommend a baseline after rebasing to it, you must add it to the list of recommended baselines with chstream –recommended.

当你想在变基后推荐一个基线，你必须使用chstream –recommended添加基线到推荐基线列表

As a rule, you should rebase development streams often to pick up changes in the project's recommended baselines. By doing so, you can find integration problems early, when they are easier to fix. In addition, rebasing just before performing a deliver operation reduces or eliminates the need for manual merging during the delivery.

作为一个规则，你应开发流变基通常获取变更，从项目的推荐基线中。就是因为这样。你能够提早找到集成问题，这样他们能够更容易被修复。同时。执行一个交付操作之前变基，减少或者消除交付操作中所需要的手工合并。

 

 

You cannot rebase when a deliver operation is in progress.

在交付操作执行过程中，不能够进行变基。

Rules for rebasing a stream（流中变基的规则）

A stream can be rebased to a baseline that meets any of the following criteria:

一个流能够变基到一个基线必须满足一下准则：

 

    * The baseline is not from the stream that is being rebased.
    * The baseline is labeled. Baselines created by deliver operations are not labeled by default. For information about how to change a baseline's labeling status, see the chbl reference page.

    *这个基线不是流中已经被变基过的

    *这个基线被标签，默认交付操作创建的基线不会被标签，（更多关于改变一个基线标签状态可以参考chbl页）

 

Additional rules apply to integration streams and development streams in selecting a baseline:

在集成流和开发流中选择基线还要遵守额外的规则：

    * An integration stream can be rebased only to a baseline created in another project or to an imported or initial baseline of that project.

    * 一个集成流只能变基到 别的项目创建的一个基线，或者那个项目中一个导入或者初始化的基线

    * A development stream can be rebased to a baseline that meets one of the following criteria:
          o The baseline was created in its parent stream.
          o The baseline is in its parent stream's foundation.
          o The baseline is an ancestor of the development stream's parent foundation baseline and created on the same stream as the parent's foundation baseline.
          o The baseline was created in a stream other than its parent stream and is contained in its parent stream. A baseline is contained in another baseline if all changes in the first baseline are included in the second baseline.

    *一个开发流能够变基到一个基线需要满足下面的任何一个准则：

          o 这个基线它父流创建的

          o 这个基线是它父流的基础

          o 这个基线是开发父流基础基线的祖先，并且在同样一个流上面被创建为父流的基础基线

          o 这个基线不一定是被他的父流创建，都是包括在他的父流里面。一个基线被另外一个基线包括。当第二个基线里面包括第一个基线里面所有变更。
      Note: Read-Only streams and nonmodifiable components in a development stream are exempt from the above rules. However, if the component's modifiability changes in the future, the development stream might not be able to modify the component at the baseline it is configured with. The development stream might be able to modify the component at the baseline it is configured with if the baseline is contained in its parent stream for this component. Otherwise, it may not until the baseline is rebased to a compatible baseline for that component.

      Note:一个开发流中的只读流和非编辑构件不需要遵守上面的规则，但是如果构件的在将来变化，开发流可能不能够编辑它基线配置的构件。开发流能编辑它基线配置的构件，如果这个构件的基线被他父流包括。否则直到他变基到这个构件的一个兼容基线。

 

 

Rebase is typically used to advance a stream's configuration, that is, to replace its current foundation baselines with more recent ones. However, under certain conditions, rebase can be used to revert a baseline, and to add or drop a component in a stream's configuration. It can also switch to a baseline that is neither an ancestor nor a descendant of the current foundation. The rules explained above are general rules for all rebase operations. You need to satisfy only the general rules when adding a component to a stream. When you advance, revert, drop, or switch a baseline, you need to satisfy the general rules and some additional ones.

变基通常被用来提升一个流的配置，也就是说，替换当前的基础基线为多个，但是，在一定情况下。变基能够用来恢复到一个基线。在一个流配置中添加或者放弃一个构件。同样不可以转变为当前基础基线的祖先或者一个后代。上面的规则是变基操作的一般的规则。你需要取符合这些规则当添加一个组件到一个流，当你提升，恢复，放弃，转变到一个基线，你需要满足这些一般规则和一些额外的。

    * To advance a stream's configuration, the new baseline must contain the current foundation baseline.

    * 提升一个流的配置，新基线必须包括当前的基础基线
    * To revert or drop a baseline for a component in a stream, one of the following conditions must be met:
          o The component is nonmodifiable.
          o The component is modifiable but has not been modified in the stream, and the component is not in the configuration of any child streams.

    * 恢复或者舍弃一个流中的一个组件的一个基线，必须满足下面的某一种情况

          o组件是非可编辑

          o组件是可编辑，不过没有在流中编辑过，组件没有任何子流配置中
    * To switch to a baseline that is neither an ancestor nor a descendant of the current foundation, one of the following conditions must be met:
          o The component is nonmodifiable.
          o The component is modifiable but has not been modified in the stream, and the component is not in the configuration of any child streams.
          o The component has been modified but the new baseline contains the current foundation baseline, and the component is not in the configuration of any child streams.
    * 横向变基到不是当前基础基线的祖先或者后代。必须满足下面的某一种情况

          o 组件是非可编辑

          o 组件是可编辑，不过没有在流中编辑过，并且组件没有任何子流配置中

          o 组件被编辑过了，但是新的基线包括当前基础基线，并且组件没有任何子流配置中
These rules ensure that any changes made in a stream are not lost when the configuration changes.

这些规则确保一个流中的创建的任何变更不会在配置改变的时候丢失。

In a rebase operation, automatic merging is the default behavior for elements,

在一个变基操作中，自动合并是元素的默认行为。