CVS Mode Methods

Top  Previous  Next

When working with the CVS mode, the documents are not locked by any user. Therefore, you may edit any document without locking it first. In the CVS mode, a document may display one of the following RCS statuses:

·

Archived – The document is archived. The local work copy is identical to the archive head.

·

Modified (Unlocked) – You have edited the document. It is recommended to check-in the document whenever it receives a significant revision.

·

Modified (Auto Merge) – You have edited the document, but the document was updated in the archive as well. It is recommended to check-in the document whenever it receives a significant revision. CS-RCS can do the merge automatically.

·

Modified (Merge Conflict) – You have edited the document, but the document was updated in the archive as well. It is recommended to check-in the document whenever it receives a significant revision. CS-RCS can perform the merge. However, you must review the result since there are conflicts you need to resolve manually.

·

Modified (Manual Merge) – You have edited the document, but the document was updated in the archive as well. It is recommended to check-in the document whenever it receives a significant revision. A manual merge is needed. (This is normal for binary files.)

·

Updated – The document was updated in the archive. Check-out the document to retrieve the current revision.

·

New – The document exists in the archive but not in your working directory. You may check-out the document to retrieve the current revision.

·

Deleted – The document has been deleted from the project. You can still retrieve the various revisions of the document to backtrack to any previous project state.

To analyze document changes, archive changes, and the merge result:

1.

Open the Document Explorer (refer to Using the Document Explorer Tool in CS-RCS Tools).

2.

Select the file you want to analyze.

3.

From the File menu, click RCS Status.

OR

1. Right-click on the selected file.

A right-click menu appears.

2. From the right-click menu, click RCS Status.

The Merge Status dialog will appear. This dialog allows you to view changes between the various revisions of the file, view merge results and perform merge. For more information, refer to The Merge Status Dialog in Branching and Merging.