Go to the previous, next section.

Buffer contents

The display contains four columns. They contain, from left to right:

• An asterisk when the file is marked (see section Selected files).
• The status of the file. See See section File status, for more information.
• A "need to be checked in"-marker (`ci').
• The file name.

File status

The `file status' field can have the following values:

`Updated'

The file was brought up to date with respect to the repository. This is done for any file that exists in the repository but not in your source, and for files that you haven't changed but are not the most recent versions available in the repository.

`Modified'

The file is modified in your working directory, and there was no modification to the same file in the repository.

`Merged'

The file is modified in your working directory, and there were modifications in the repository as well as in your copy, but they were merged successfully, without conflict, in your working directory.

`Conflict'

A conflict was detected while trying to merge your changes to file with changes from the source repository. file (the copy in your working directory) is now the output of the `rcsmerge' command on the two versions; an unmodified copy of your file is also in your working directory, with the name `.#file.version', where version is the RCS revision that your modified file started from. See section Viewing differences, for more details.

`Added'

The file has been added by you, but it still needs to be checked in to the repository.

`Removed'

The file has been removed by you, but it needs to be checked in to the repository. You can resurrect it by typing a (see section Adding and removing files).

`Unknown'

A file that was detected in your directory, but that neither appears in the repository, nor is present on the list of files that CVS should ignore.

There are also a few special cases, that rarely occur, which have longer strings in the fields:

`Removed from repository'

The file has been removed from your directory since someone has removed it from the repository. (It is still present in the Attic directory, so no permanent loss has occurred). This, unlike the other entries in this table, is not an error condition.

`Removed from repository, changed by you'

You have modified a file that someone have removed from the repository. You can correct this situation by removing the file manually (see see section Adding and removing files).

`Removed by you, changed in repository'

You have removed a file, and before you committed the removal someone committed a change to that file. You could use a to resurrect the file (see see section Adding and removing files).

`Move away file - it is in the way'

For some reason CVS does not like the file file. Rename or remove it.

`This repository is missing! Remove this dir manually.'

It is impossible to remove a directory in the CVS repository in a clean way. Someone have tried to remove one, and CVS gets confused. Remove your copy of the directory.

Selected files

Many of the commands works on the current set of selected files.

• If there are any files that are marked they constitute the set of selected files.
• Otherwise, if the cursor points to a file, that file is the selected file.
• Otherwise, if the cursor points to a directory, all the files in that directory that appears in the buffer are the selected files.

This scheme might seem a little complicated, but once one get used to it, it is quite powerful.

See section Marking files tells how you mark and unmark files.

Go to the previous, next section.