Java Reference
In-Depth Information
In such a case, the programmer must decide which changes to keep, or
how to combine them. After editing the file and removing the dividing lines
(i.e.,
<<<<<
,
=====
, and
>>>>>
), recompiling and probably a bit of testing,
too, the programmer can now do a
cvs commit
to incorporate his changes in
the repository.
8.2.6
With each
cvs commit
you are prompted for a comment, to describe the
changes that you are committing. What happens to these comments? How can
you see them again? Use the
cvs log
command to show the history of a file's
revisions and associated comments.
See Example 8.2 for an example of the cvs output command.
Looking down the output of
cvs log
, you can see
Log
• The complete filename—in the repository—of the file whose log we're
checking out.
• The local filename in your sandbox.
• Which revision is the “head,” that is, the front-most or default revision.
• Which branch, if any.
• What kind of locking mechanism CVS uses. There are some choices, but
most users of CVS leave this as is.
• The access limitations. CVS can limit who can modify files (see our
reference list if you need to use this).
• A list of all the tags (symbolic names) for this module and to which
revision each refers.
• What kind of keyword substitution happens. For binary files this would
be
kb
.
• The count of revisions for this file.
Then comes a description of each of the revisions, showing
• The revision number.
• Some stats on the change including the user ID of the user who committed
the change.
• How many lines were added and deleted compared to the previous revi-
sion.
