Java Reference
In-Depth Information
Added
—Files added to your working directory either because they were
recently added to the
CVS
module or because you've picked up new direc-
tories not present in your working directory before the update
■
Deleted
—Files that have been removed from the repository and, conse-
quently, your working directory
■
Modified
—Files that have been locally modified in your working directory
■
Merged
—Files that have been locally modified as well as updated on the
server, and that
CVS
has successfully merged the changes into your local file
■
Merged with Conflicts
—Files that have been locally modified as well as
updated on the server in such a way that
CVS
can't accurately merge the
two sets of changes
■
Not in repository
—Files in your working directory that aren't under
source control and that have not been explicitly added to the list of
ignored files
■
Viewing the status of your project
You can use the
CVS
| Check Project Status
command to see the files that have
been added, removed, or modified by yourself and others. This view looks like
the
Update
window we just discussed, but it obtains the information without
modifying any of your local files (if you're familiar with
CVS
, this is like issuing the
cvs -nq update
command). Similarly, you can right-click a file in the project view
or through the editor's context menu and select
CVS
| Show Status
to review the
status of just the selected file.
Figure 8.11 Output from the CVS update process is displayed in a tool window,
making it easy to review for pertinent information.