[ Programming Trail >> CVS Trail >> CVS Terminology ]
List of concepts/terms associated with CVS.
Note:
When you put a file in the Repository, CVS keeps the revision information in a sub-directory called CVS. So, please do not create a folder called CVS in your project.
CVS
CVS is a version control system for source files. It facilitates management of versions of not only individual files but also entire software projects[1].
Repository - Part of CVS
CVS stores all files in a centralized directory called the repostiory. The directory is defined by the environment variable $CVSROOT[1].
Module/Project/Trunk(?) - Collection of files and folders inside Repository
The files in the repository are organized in modules. Each module is made up of one or more files, and can include files from several directories. A typical usage is to define one module per project[1].
Interaction - Things you can do
checkout, add, remove, status, update, commit, release, import , export, diff, watch
Branch - Copy of an old release
Is a special case of updating an old release of software package. You branch the trunk at a previous release (based on Tag or Date) and make modification in the branch to create a new sub-release of the software. Later you can merge the sub-release to the old release. This way you can have modify an old release without affecting your current development.
Merge - Merge a branch to the original release
Is a special case of updating where branches root and tip are compared and changes incorporated into the tip of the branch.
Tag - String link different revisions
A symbolic name (Release_May_2004) given to all the latest revisions of files to string link them at an important stage (e.g. Public release of a version). Only letters, numbers, underscores and hyphens should be used for tagging. Please no spaces, periods, colons, commas, or any other symbols.
Check Out
Get the current copy of a file from the Repository.
Working Copy
The Check Out file on which you work .
Commit/Check In
Update the Working Copy in the Repository.
Conflict
Two or more users trying to Commit the same Working Copy.
Log Message
The message associated with a file when you commit.
Revision
Current or previous snapshot of a file in Repository.
Version
Version number of a software package given by you that is a combination of various CVS Revision files.
Update - Update your check out
Update the Check Out files that is modified by others (i.e. Other people Working Copy). CVS checks the difference between the working copy you have (of another guy) and the repository's recent revision and applies the changes on your check out file.
Status - Verbose output about a file
Status of a file in the repository (verbose output). Interesting tool to use between commands, especially when you are new to CVS.
pserver - Client password authentication server
Usually runs on port 2401 (49^2) and users connect to the repository from a client.
Next: Getting and Installing CVS
References
1. http://www.arc.unm.edu/~rsahu/cvs.html
See Also
Getting and Installing CVS
Contributors
-- Jyotirmaya Nanda (August 6, 2004)
I block the IP address(es) of users trying to vandalize my wiki. A simple mail to me can remove your IP from the blocked list. If you are new to wiki and want to try something out please do so at the Wiki Sand Box. Thank you !!.
|