CLI User's Guide - AccuRev

may have made conflicting changes to the same variable setting. That part of the merged file
might look like this:
> Backing_Version
merge puts in the separator lines and the “Your_Version” and “Backing_Version” annotations.
You edit out all this extra text, leaving just the correct assignment of the retValue variable, say:
int retValue = ERROR_NO_COLOR;
When you’ve fixed all such conflicts, you keep the merged file as a new version in your
workspace.
The preceding paragraphs describe AccuRev’s command-line merge algorithm. Alternatively, you
can set an environment variable to have merge invoke a third-party merge program.
What About All the Other Commands
The preceding sections focus on the day-to-day AccuRev tasks — and the accurev commands —
that you are most likely to perform as a developer. The remainder of this chapter provides an
overview of the entire CLI, with the discussion organized into broad functional categories. Each
command will be discussed in much less depth than in the preceding sections. For full details, see
the chapter AccuRev® Command-Line Reference on page 35.
Managing a Depot’s Stream Hierarchy
Creating Data Structures
Command
mkdepot
mkref
mksnap
mkstream
mkws
Description
create a new depot
create a new reference tree
create a new snapshot
create a new dynamic stream
create a new user workspace
Maintaining Data Structures
Command
chdepot
chref
chslice
Description
change the properties of a depot
change the name and/or definition of a reference tree
change the location of a slice
AccuRev® CLI User’s Guide 27