RADE

Source Code Manager

adl_set_merge

Setting merge's characteristics

Quick Reference

Abstract

The adl_set_merge command sets parameters for solving merges of the specified workspace or the current one.

Synopsis
Usage
Options
Examples
References

Synopsis

adl_set_merge [workspace_name] [-tree ws_tree_name...] [-later | -immediate] [-auto | -no_auto] [-h | -help | -?]

Usage

When a workspace is created with the [1] adl_mk_ws command, parameters are set automatically. To modify the parameters relatives to the merge, you can run the adl_set_merge command.

This command has several options allowing the modification of the following characteristics:

Launching the interactive merge during the synchronization, or launching it later with the [3] adl_solve_merge command
Launching the merger automatically or not

To see the list of merges left to be resolved in a workspace, run the [2] adl_ls_merge command

[Top]

Options

adl_set_merge accepts the following options:

`-h\|-help\|-?`	Help of the command
`workspace_name`	Name of the new workspace
`-tree ws_tree_name...`	To reduce the effect of the command to a subset of trees.
`-later`	Merges are never solved during the execution of a flow command (adl_collect, adl_sync, etc)
`-immediate`	Merges are solved as soon as they occur (adl_collect, adl_sync, etc). This is the default mode.
`-auto`	When possible the merges are performed without interaction with the user (default mode).
`-no_auto`	Merges are always performed under user control.

[Top]

Examples

Update of the parameters of "MyWsDev" workspace:

adl_ch_ws MyWsDev
adl_set_merge -later

Update of the parameters of "MyOtherWs" workspace:

adl_set_merge MyOtherWs -auto

[Top]

References

[1]	adl_mk_ws: creating a workspace
[2]	adl_ls_merge: listing merges to be done
[3]	adl_solve_merge: resolving merges

[Top]

History

Version: 2 [Oct 2001]	New option -tree
Version: 1 [Mar 2001]	Document created

[Top]