Sun WorkShop TeamWare 2.1 User's Guide

Using TeamWare Versioning

Versioning is a GUI to SCCS that enables you to manipulate files and perform SCCS functions without having to know SCCS commands. It provides a way to check files in and out, and to display a file's delta history and show differences between deltas. With Versioning, you can do the following:

Starting Versioning

You can start Versioning in three ways:

To use Versioning, select a file (or group of files) in the File List pane of the Versioning window (see Figure 1-3) and choose a menu item to operate on it. Commands are located in the:

Following are two examples that describe how to use Versioning to check out and check in files, and to view and compare a file's delta history.

Figure 1-3 Versioning Window

Graphic

Checking Files In and Out of SCCS

You can check files in and out of SCCS using Versioning.

Checking a File Out

To check a file out of SCCS:

  1. If the directory that contains the file is not automatically loaded, type the directory path name (followed by Return) in the Directory text box.

  2. Click a file icon to select a file; use the middle mouse button to extend the selection.

  3. Choose either Commands > Checkout > Default or Commands > Checkout > Check Out, and Commands > Edit. As the file is checked out a check mark appears in its icon.

Checking a File In

To check a file in to SCCS:

  1. When you are ready to check the file back in, select the file and choose Commands > Check In to open the Check In popup window.

  2. Enter a comment in the text pane that describes your changes and click Check In to complete the check in process.

    The check mark is removed from the file icon as the file is checked in.

Viewing and Comparing a File's Delta History

To view a graph of a file's delta history:

  1. Select the file's icon in the main window and choose View > File History.

  2. Select two deltas in the graph.

  3. Choose Differences > Use Merging.

    Merging displays the two deltas side by side, marking differences with glyphs. For more information about Merging, see Chapter 10, How Configuring Merges SCCS Files."

Merging Previously Unmerged Branch Deltas

To show the version history for a file:

  1. Select the file's icon in the main window and choose View > File History.

  2. In the History window, select the two versions that you want to merge.

  3. Click the right mouse button to open a popup menu that contains the Merge Branches command.

  4. Choose Merge Branches from the popup menu.

For more information about TeamWare Versioning, see Chapter 12, Performing Basic SCCS Functions with Versioning."