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