CVS Cheat Sheet

Local access (NFS):

Note: the commands listed below assume that CVSROOT is set to the path of your repository

cvs get [flags] module… creates a new working directory (project)
-r tag check out revisions tagged with tag

cvs update [flags] [file…] merge repository changes into local working files
-d build newly added directories (like get does)
-r tag move to revisions tagged with tag
-r branch-tag move to branch tagged with branch-tag
-A return to trunk
-j tag merge changes from tag to branch tip
-j tag1 –j tag2 merge changes from tag1 to tag2

cvs commit [flags] [file…] check local changes into the repository
-m message use the message as change’s log entry

cvs tag [flags] tag [file…] tag current revisions of file… with tag
-d tag remove the tag from all file…
-b create a branch off of current revisions
-F tag overwrite an existing tag of the same name on a different revision

cvs add [flags] file… mark file… for addition
-m message use message for file… description
-k mode where ‘b’ is for binary and ‘kv’ for text

cvs diff [flags] [file…] show local changes to file…
-c provide context diff (human readable)
-r tag compare with revision tagged with tag
-r tag1 –r tag2 compare revisions tagged with tag1 and tag2
anything else passed through to diff command

cvs log [flags] file… show log (history) entries for file…
-h show only log header information for file…

cvs status [flags] file… show local and repository status of file…


Client/Sever access:

setenv CVS_RSH ssh

cvs :ext:cvs.pdx.intel.com:

e.g. cvs –d :ext:cvs.pdx.intel.com:/nfs/site/proj/dt/crt_cvsroot co qea

Note: if you get the error: “cvs command not found”, try the command again after setting “setenv CVS_SERVER /usr/intel/bin/cvs”


NOTES:
If file… is omitted, CVS assumes ‘.’.

As printed by the update command reports:
U filename file updated to repository version
P filename file patched to repository version (essentially the same as U)
M filename file is locally modified (or merged)
C filename file contains a conflict(s) (merge has produced this)
R filename file marked for removal
A filename file marked for addition
? filename file is not under CVS control