RADE

Source Code Manager

adl_ls_merge

Listing merges

Quick Reference

Abstract

The adl_ls_merge command lists the merges still to be solved in a workspace.

Synopsis
Usage
Options
Examples
References

Synopsis

adl_ls_merge [workspace_name] [-tree ws_tree_name...] [-program [-sep | -separator char]] [-chg_info] [-out file_path] [-h | -help | -?]

Usage

The command lists, tree by tree, the files on which a merge needs to be done, indicating the merge type.

This command can be run either on the current workspace either on a given workspace.

The display can be limited to some of the trees, in the case of a multi-tree workspace.

The data displayed are:

object path
merge type
seen (as deleted (1) or not deleted (0))
with "chg_info" option : history of conflicting changes

The different merge types are:

deleted: CH_DELETED
file modification: CH_CONTENT
move: MOVE
change file type: CH_EXEC
change file description: CH_DESCR

Those data can be displayed either in a normal mode ("deleted" or "not deleted") or in a program mode ("1" or "0"). The result of the command can be sent in the file of your choice, and you can work with those results afterwards.

The "-program" option displays information in a specific output mode. For more details, see the article explaining this option.

[Top]

Options

adl_ls_merge accepts the following options:

`-h\|-help\|-?`	Help of the command
`workspace_name`	Name of the workspace
-tree ws_tree_name	To restrict the command to a set of workspace trees
`-program`	Display for programs: object path, merge type, seen as deleted (1) or not (0)
`-sep \| -separator`	Separator character between each field for programs (default value is blank)
`-out file_path`	Path of a file for writing the results
-chg_info	Display informations (history) of each change to merge

[Top]

Examples

Display of all the merges to be done of the current workspace "Ws11":

adl_ls_merge

1 merge(s) to solve in the workspace "Ws11":
Fw3\Mod3.m\Imakefile.mk Change of content

Display of all the merges to be done of the current workspace "Ws11" in a program mode. The result is sent to the file "MyFile":

adl_ch_ws MyWs
adl_ls_merge -program -out MyFile

Content of the file MyFile
MERGE T1 DsjnaZhC7as3+++3x+6f Fw3/Mod3.m/Imakefile.mk DsjudJhC7as3+++5O+6o CH_CONTENT NOT_DEL
___SO_CHG ++++2DztjKW2XLas3+++AT+5R CH_CONTENT PROJ TO_MERGE DztjKW2XLas3+++AT+5P TEXT 2004/01/09-09:07:27 47 NOT_CREATED_BY_MERGE
____CREATED ctc ctc ________________ adl_ci 2004/01/09-10:07:38 Ws11 DsjomJhC7as3+++6p+14 T1 DsjnaZhC7as3+++3x+6f test_scm_adl2 Dsif2OXb0xg3+++5Z+6T
___SO_CHG ++++3Dztj8G2XLas3+++7y+4D CH_CONTENT NOT_PROJ TO_MERGE Dztj8G2XLas3+++7y+4B TEXT 2004/01/09-09:06:22 44 NOT_CREATED_BY_MERGE
____CREATED ctc ctc ________________ adl_ci 2004/01/09-10:06:49 Ws1 DsjoS3hC7as3+++6t+1G T1 DsjnaZhC7as3+++3x+6f test_scm_adl2 Dsif2OXb0xg3+++5Z+6T

MERGE : this keyword is followed by information about the merge :
- <WsTreeCaseName> : name of the tree
- <WsTreeId> : unique database identifier of this tree (computed by SCM)
- <SoftObjPath> : relative path to the software object
- <SoftObjId> : unique database identifier of the software object (computed by SCM)
- CH_DELETED | MOVE | CH_CONTENT : SCM modification type
- DEL | NOT_DEL : state of the software object, seen as deleted or not

Display of a workspace, with no merge left to do:

adl_ls_merge
No merge in the workspace "MyWs"

Display of a workspace, with chg_info option:

adl_ls_merge -chg_info
1 merge(s) to solve in the workspace "Ws11":

Fw3/Mod3.m/Imakefile.mk Change of content
Created by ctc with adl_ci on Friday, January 09, 2004 10:07:38 AM in the workspace Ws11, tree T1.
Created by ctc with adl_ci on Friday, January 09, 2004 10:06:49 AM in the workspace Ws1, tree T1.

[Top]

References

[1]
[2]

adl_set_merge: Updating merge's parameters
adl_solve_merge: Resolving merges

[Top]

History

Version: 4 [Jan 2004]	Support of -chg_info option
Version: 3 [Mar 2002]	Support of -tree option
Version: 2 [Nov 2001]	Document update
Version: 1 [Mar 2001]	Document creation

[Top]