Source

pcl-cvs / states.texi

@node DIRCHANGE

stderr: 
@samp{cvs update: Updating @var{dir}}

Sets @code{*current-dir*} and @code{*current-file*}.
@node CVS-REMOVED

stderr:
@samp{cvs update: warning: @var{file} is not (any longer) pertinent}
or
@samp{cvs update: @var{file} is no longer in the repository}

Sets @code{*current-file*}.

@node Removed locally
Not yet handled (bug id 86).
@samp{cvs update: warning: @var{file} was lost}

@node MOVE-AWAY
@samp{cvs update: move away @var{file}; it is in the way}

Sets @code{*current-file*}.
@node Waiting for lock
@samp{cvs update: [@var{hh:mm:ss}] waiting for @var{user}'s lock in @var{dir}}
A message is printed in the @samp{*cvs*} buffer.

@node REM-CONFLICT
@samp{cvs update: conflict: @var{file} is modified but no longer in the repository}

Sets @code{*current-file*}.

@node MOD-CONFLICT
@samp{cvs update: conflict: removed @var{file} was modified by second party}
Sets @code{*current-file*}.

@node REM-EXIST
@samp{cvs update: @var{file} should be removed and is still there}

@node REPOS-MISSING
@samp{cvs update: in directory @var{dir}
cvs [update aborted]: there is no repository}

Sets @code{*current-file*}.

@node CONFLICT
@example
RCS file: @var{file}
retrieving revision @var{base-rev}
retrieving revision @var{head-rev}
Merging differences between @var{base-rev} and @var{head-rev} into @var{file}
\(rcs\)?merge\( warning\)?: overlaps during merge
cvs update: conflicts found in @var{file}
@end example

Sets @code{*current-file*}.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.