Java Reference
In-Depth Information
or since a certain date:
$ cvs diff -D 06-Sep-03 Account.java
8.2.4
If there are other people working on this project with you, they will also be
making changes. To bring there changes into your sandbox, run the
cvs
update
command:
Update
$ cvs update
cvs server: Updating .
P Account.java
M User.java
cvs server: Updating subdir
Here,
P
indicates CVS has patched in changes to that source file; and
M
indicates you have modified the file. Note that
Xyz.java
is not mentioned.
That means there were no updates involved.
The subdirectory
subdir
was also updated, but no changes were made.
Had a change been made, you would see the modified files mentioned by name.
You can update a single file at a time by naming that file on the command
line, but typically you want to get the changes for all the files in a directory, or
even all the changes throughout the project, since a change in one file may be
dependent on changes in other files.
Sometimes when you try to commit your changes you will be told that the
commit did not succeed because one or more of your files was not up to date.
Not to worry; it's easy to bring your files up to date. This leads directly into
our next topic. Read on!
8.2.5
When you commit changes, a new version of each changed file is now part of
the repository. If someone else commits changes, that person's changes are now
part of the repository as well. But those changes (unlike your own local changes)
are yet to appear in your own local copy of the files, that is your sandbox.
The following CVS command will bring your files up to date with all the
changes made since you checked out your copy (or last did an update):
Merges
$ cvs update
