RADE

Source Code Manager

adl_collect

Collecting modifications

Quick Reference

Abstract

The adl_collect command collects all the promotions of each child workspace, in the current workspace.

Synopsis
Usage
Options
Process
Necessary Context
Prerequisite commands
Simulation
Examples
References

Synopsis

adl_collect [workspace_name...] [-tree ws_tree_name...] [-no_ds] [-simul] [-no_manual_merge] [-merge_info file] [-h | -help | -?]

Usage

It is possible either to give the names of the workspaces to be collected, or to collect all the workspaces having promoted, if no workspace name has been given.

Example:
adl_ch_ws Ws1 –image Image1
adl_collect

It is possible to make several collects one after another, if there are no merges or no local modification between the collects.
Error management:
Error cases (return code different from 0) are:

At least one of the workspace(s) given as parameter of the command does not exist in any tree of the site
At least one of the workspace(s) given as parameter of the command exists in at least one tree of the site, but this workspace is not a child of the collecting workspace in any tree of the site.

Non-error cases (return code equal to 0) are:

There is nothing to collect for one or more child workspace(s) in one or more tree(s) of the collecting workspace
Each workspace given as parameter exists at least in one of the collecting workspace tree(s), and is its child
The collecting workspace has no child (there is nothing to collect).

Example:
Context:

Tree1: WsRoot1 __ Ws1 __ Ws11 | |__ Ws12 | |__ Ws13 | |__ Ws2 Tree2: WsRoot2 __ Ws1 __ Ws11 | |__ Ws13

Commands:

adl_ch_ws Ws1
adl_collect WsBidon Ws11	=>	run adl_ls_ws and choose an existing workspace. Return code ? 0.
adl_collect Ws11 Ws12 Ws13	=>	Ws11 will be collected in Tree1 and Tree2. Ws12 will be collected in Tree1. Ws13 will be collected in Tree1. Return code = 0.
adl_collect Ws2 Ws11	=>	run adl_ls_ws –from Ws1. Return code ? 0.
adl_collect	=>	Ws11 will be collected in Tree1 and Tree2. Ws12 will be collected in Tree1. Ws13 will be collected in Tree1. Return code = 0.
adl_collect Ws1 Ws11	=>	run adl_ls_ws –from Ws1. Return code ? 0.
adl_ch_ws Ws11
adl_collect	=>	There is nothing to collect. Return code = 0.

[Top]

Options

adl_collect accepts the following options:

`-h\|-help\|-?`	Help of the command
`workspace_name ...`	Workspace's name to collect
`-tree ws_tree_name`	Collect only these workspace trees.
`-no_ds`	No display
`-simul`	To simulate the collect.
`-no_manual_merge`	Not to solve merge at the end of the command (useless if adl_set_merge -later has been run).
`-merge_info file`	File in which to write whether merges should be solved or not (interface with other tool).

[Top]

Process

1. Photo if necessary
2. Collect (creation of a new version if no collect has been done just before)
3. Automatic merges
4. Refresh of the current image
5. Manual merges

The following modification, provided it is different from a collect, leads to a photo. You can do several collects on the same version of a workspace.

[Top]

Necessary context

Promotions must exist.
The context is identical to the context of the [3] adl_photo command.

[Top]

Prerequisite commands

[1] adl_ci (or [3] adl_photo) in the other workspace's images.
[2] adl_solve_merge
[4] adl_rm_priv or [5] adl_co

[Top]

Simulation

With the “-simul” option, you can simulate a collect, without validating it. At the beginning and at the end of the simulation, the following messages are displayed:

--- Beginning of simulation ---
...
--- End of simulation ---

These messages explain the use of the “-simul” option, and reassure the user.
A control that would cancel a command in usual mode, becomes a warning in simulation mode.

For example, an “adl_promote” is refused if the parent workspace has blocked the requests for promotion, but an “adl_promote –simul” will display a message indicating the refusal of these promotion requests, but will finish the promotion simulation. You can see the list of all the promoted modifications.