Version Control Flashcards
Version Control System (VCS)
A system for storing and retrieving variants of items.
Version
A collection of items is a variant of the collection resulting from some modification of one or more of its constituents
Revision
A version stored in a VCS
Baseline
The first revision of a collection of items storied in a VCS
Repository
The store in which a VCS records revisions
Checked in/Committed
When a version is stored in the repository
Checked out/updated
When a version is retrieved from the repository
Working copy
A checked out version of an item
Initial Commit
A collection of items enters a VCS as this.
Trunk
Main line of succession of revisions s is called a trunk and the other lines of succession are branches
Tags
Identifiers to keep track of each revision.
Head revision/tip
The latest revision of a branch
2 main policies to control incompatible commits
File Locking
Concurrent modification and merge
File Locking
Policy to control incompatible commits (1 out of 2) : Items can be retrieved from repository with individual files checked out either read-only or for modification. When for modification files locked, so no one else can check it out for modification until checked in again. One at a time check-out. Avoid incompatible commits.
Concurrent modification and merge
Policy to control incompatible commits (2 out of 2) : Anyone can edit at same time, but once one person commits a new version of working copy, the next person who tries to commit will not be able to until they update his or her working copy. VCS attempts to create new working copy incorporating all changes.