RADE

Synopsis

adl_solve_merge_is [-transfer TransferName] [-tree TreeName] [-h | -help | -?]

Usage

The adl_solve_merge_is command is used when merges occur in the remote mirror workspace associated with the current intersite transfer. The purpose of this command is to solved those distant merges by

1. importing them in the local workspace
2. solving then locally using the adl_solve_merge command
3. exporting the results to the remote mirror workspace

Note that the third step consists in transferring all the modifications that exist in the local workspace and not only the results of the merges. So it is possible to see other changes than the results of the merges that are transferred into the remote mirror workspace.

it is possible to interrupt the adl_solve_merge command that is started during the step 2. In that case the local workspace will remain in a state where the only command that can be run is the adl_solve_merge [5] command. 

To read more about the inter-site transfer, see the "Inter-site transfer" article.

To read more about merge's principle, you can see either the [2] "Merger User Interface article", either the [3] "Resolving Conflicting Changes article" with the merger article.

[Top]

Inter-site merge cases

This command will be necessary if there is a conflict between the remote mirror workspace and the local workspace. Here are two cases that can happen:

- Case 1 -

• adl_promote_is  in the local workspace: the promotion is then waiting for collect by the remote parent workspace
• adl_rm req  in the remote parent workspace: the pending promotion is then canceled and the changes remain in the remote mirror workspace
• adl_sync_is in the local workspace
• another adl_sync_is later in the local workspace. In this case, if the synchronization is OK, then there is no problem. The synchronization can fail if there is a merge to resolve in the mirror workspace. To resolve this case, you have to execute in the local workspace an adl_solve_merge_is command

The adl_solve_merge_is command downloads the objects in the local workspace, resolves the merge, then sends immediately the result in the mirror workspace.

- Case 2 -

• adl_promote_is  in the local workspace
• adl_publish  in the remote workspace at the same time. In this case, the promotion is stopped in the remote workspace. Merge can happen, and they are not resolved then.

The adl_solve_merge_is has to be launched in the local workspace.

[Top]

Options

adl_solve_merge_is accepts the following options:

[Top]

Examples

Resolving merges to be done in the current workspace "MyRootLocalWs" for the transfer Transfer1:

adl_ch_ws MyRootLocalWs  ... adl_solve_merge_is -transfer Transfer1 Changing current remote working workspace to "MIRROR_DSY_MyRootLocalWs_1"... Solving merge(s) for the workspace "MyRootLocalWs" in the workspace tree "treelocal"... Extracting changes in remote workspace MIRROR_DSY_MyRootLocalWs_1... Computing new changes in remote workspace "MIRROR_DSY_MyRootLocalWs_1" since last transfer... ... Forcing new modifications in local workspace MyRootLocalWs... Solving implicit and automatic merges in workspace "MyRootLocalWs" in the workspace tree "treelocal". No merge can be solved. Solving manual merges in workspace "MyRootLocalWs" Merge type: Change of content 1 - Fw1/mod.m/src/fic.cpp treelocal Enter - 1, 2... to solve a merge - G not to use the graphic tool for text file contents - L to list the merges to solve again - Q to quit Your choice: 1 ... # HERE THE GRAPHIC MERGER TOOL IS STARTED # No more merge. Refreshing the image "UNIX" of the workspace "MyRootLocalWs". Fw1/mod.m/src/fic.cpp has been modified Command successful. Checking for changes on responsibles of components... # HERE, THERE ARE MESSAGES CORRESPONDING TO THE SENDING OF THE LOCAL WORKSPACE TO THE REMOTE MIRROR WORKSPACE # ... Intersite command successful.

Resolving merges in the mirror workspace associated with the local workspace "MyRootLocalWs", with no merge left to do:

adl_ch_ws MyRootLocalWs  
...

adl_solve_merge_is 
There is no merge to be solved in the remote mirror workspace "MIRROR_DSY_MyRootLocalWs_1".