Based on what operations you have performed on a
checked out file, and what operations others have
performed to that file in the repository, one can
classify a file in a number of states. The states, as
reported by the status
command, are:
add
, and not yet
committed your changes.
remove
, and not yet
committed your changes.
update
rather than
checkout
to get that newer revision.
update
command gave a conflict. If you have not
already done so, you need to
resolve the conflict as described in section Conflicts example.
add
.
To help clarify the file status, status
also
reports the Working revision
which is the
revision that the file in the working directory derives
from, and the Repository revision
which is the
latest revision in the repository for the branch in
use.
The options to status
are listed in
section Quick reference to CVS commands. For information on its Sticky tag
and Sticky date
output, see section Sticky tags.
For information on its Sticky options
output,
see the `-k' option in section update options.
You can think of the status
and update
commands as somewhat complementary. You use
update
to bring your files up to date, and you
can use status
to give you some idea of what an
update
would do (of course, the state of the
repository might change before you actually run
update
). In fact, if you want a command to
display file status in a more brief format than is
displayed by the status
command, you can invoke
$ cvs -n -q update
The `-n' option means to not actually do the
update, but merely to display statuses; the `-q'
option avoids printing the name of each directory. For
more information on the update
command, and
these options, see section Quick reference to CVS commands.
Go to the first, previous, next, last section, table of contents.