Do not confuse MacCVSClient with MacCVS Pro or MacCVS;
they are three separate programs despite the
similarity in names.
Screen Shots
Start with the connection dialog (GIF,
3K) which prompts for the information needed to
connect to a CVS server. Then proceed to the
checkout dialog (GIF,
8K), which asks you what you want to check out
from CVS.
Once you have files checked out, select the
"File/Open" menu to bring up the module window (GIF,
9K) which shows a list of files and information
about each one.
If several people edit the same file in
incompatible ways, it is a "conflict". The conflict
window (GIF,
8K) shows you the conflicts so that you can
resolve them with a text editor.
To display the differences between two revisions
of a file, first select the "CVS/Diff" menu which
will bring up the diff dialog (GIF,
5K) which prompts for information such as
whether to ignore spaces in showing differences.
Then files which have changed are displayed with a
delta icon and you can double click them to bring
up the diff window (GIF,
8K) which displays added lines, deleted lines,
and unchanged lines in different colors.
|