SYNTAX

MergeBranch file

DESCRIPTION

The MergeBranch script merges a branch revision of a file onto the revision trunk. Using the ProjectInfo command, MergeBranch determines which project file belongs to and whether it is in fact a branch revision.

If all the file's revisions are older than the branch, the branch is checked in as the latest trunk revision. Otherwise MergeBranch checks out the latest revision on the trunk and calls CompareFiles to allow you to copy differences from the branch into the trunk revision. When this merging process is completed, you can check the modified trunk revision back into the project.

INPUT

None

OUTPUT

None

ALIAS RESOLUTION

This command does not resolve leaf aliases used as part of a path or filename. Finder alias files are not recognized by Projector.

STATUS

MergeBranch can return the following status codes:

PARAMETERS

file

Specifies the branch to be merged onto the trunk. Note that file must belong to a currently mounted project and must be a branch revision, with a revision number containing one or more letters.

OPTIONS

None

EXAMPLES

Assuming that file.c is a branch revision and that it is newer than the revisions of that file on the main trunk, MergeBranch merges it onto the trunk by checking it in as the latest revision:

MergeBranch file.c

The following command line adds Merge Branch as a menu item to the Project menu. When selected, this menu item merges the branch revision in the active window onto the trunk.

AddMenu Project 'Merge Branch' 'MergeBranch "{Active}" ∑∑ "{WorkSheet}"'

SEE ALSO

CompareFiles