Version Control

Question 1

Types of Version Control Systems

Answer 1

• Local
• Centralized
• Distributed

Question 2

• Local database keeps track of file versions
• e.g. RCS (Revision Control System)

Answer 2

Local VCS

Question 3

VC systems either keep:
* actual copies of file versions; or
* ________, which are the set of additions / subtractions to a file.

Answer 3

patch sets

Question 4

• A single server contains the file versions
• Clients check out individual files/folders from the central server
• Collaboration with others is possible
• Easy to administer file permissions
• Single point of failure

Answer 4

Centralized VC

Question 5

Examples of Centralized VC

(According to the slides)

Answer 5

• CVS (Concurrent Versions System)
• Subversion
• Perforce

Question 6

• Machines fully mirror the repository, including the history of changes
• Peer-to-peer approach
• Each peer is a valid repository
• No single point of failure
• Large repositories may be impractical to mirror (either due to large files, or very long histories)

Answer 6

Distributed VCS

Question 7

Examples of Distributed VCS

(According to the slides)

Answer 7

• Git
• Mercurial
• Bazaar
• Darcs

Question 8

Advantages of VCS

Answer 8

• Backup & Restore - Save all your changes and jump to any version at any time.
• Short-term / Long-term undo - No fear of experimental changes, whether short or long term.
• Synchronization - Stay up to date with teammates’ work.
• Track Changes - Track the development of each file, and explain why the changes happened.
• Track Ownership - Find out who made a particular change.
• Branching/Merging - Make a copy of your code that you can modify in isolation. You can delete, or merge this copy back to the ‘main’ version.

Question 9

VCS Terminology

• Where the files are stored
• Repositories can be remote or local
• Local repos are also called the working copy

Answer 9

Repository

Question 10

VCS Terminology

(n.) a copy of another repository (all the files, and revision history)

Answer 10

Clone

Question 11

VCS Terminology

• (v.) To record the changes in the VC history/log
• (n.) a version or ‘checkpoint’ that you can go back to any time

Answer 11

Commit

Question 12

VCS Terminology

The latest commit in the repository

Answer 12

Head

Question 13

VCS Terminology

• A copy of the code base
• Each branch can evolve separately from otherbranches
• The stable code is usually found in a main branch (in Git this is called master)

Answer 13

Branch

Question 14

• Different branches can be merged together
• • e.g.
    Branch A has commits 1 & 2
    Branch B has commits 1, 2, & 3
    B can be merged into A so that A will have the 3rd commit as well

Answer 14

Merge

Question 15

• When there are two or more conflicting changes to the same file
• ________ must be resolved

Answer 15

Conflict/s

Question 16

To get all the latest changes from the remote repo and put them in your local repo

Answer 16

Update/Sync

Question 17

True or False

Git =/= GitHub

Answer 17

True

They are independent of each other.

Question 18

• A distributed version control system
• Free and open-source software
• Primarily a command line tool
• Has 3rd party GUI and add-ons for IDEs

Answer 18

Git

Question 19

• A website/service designed to function with Git(but not other VCS)
• Main function: Allows users to create git repositories on their server
• Alternative: GitLabs, BitBucket

Answer 19

GitHub