Version Control Flashcards

1
Q

Version Control System (VCS)

A

A system for storing and retrieving variants of items.

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
2
Q

Version

A

A collection of items is a variant of the collection resulting from some modification of one or more of its constituents

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
3
Q

Revision

A

A version stored in a VCS

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
4
Q

Baseline

A

The first revision of a collection of items storied in a VCS

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
5
Q

Repository

A

The store in which a VCS records revisions

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
6
Q

Checked in/Committed

A

When a version is stored in the repository

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
7
Q

Checked out/updated

A

When a version is retrieved from the repository

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
8
Q

Working copy

A

A checked out version of an item

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
9
Q

Initial Commit

A

A collection of items enters a VCS as this.

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
10
Q

Trunk

A

Main line of succession of revisions s is called a trunk and the other lines of succession are branches

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
11
Q

Tags

A

Identifiers to keep track of each revision.

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
12
Q

Head revision/tip

A

The latest revision of a branch

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
13
Q

2 main policies to control incompatible commits

A

File Locking

Concurrent modification and merge

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
14
Q

File Locking

A

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.

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
15
Q

Concurrent modification and merge

A

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.

How well did you know this?
1
Not at all
2
3
4
5
Perfectly
16
Q

Conflict

A

If same portion of a file has changes in both the repository and in the old working copy. Then they are asked to resolve it. Resulting version of working copy is then stored as the current revision.

17
Q

Centralized VCS

A

It has one repository

18
Q

Distributed VCS

A

It has several repositories none of which are considered authoritative
- introduces problems b/c new opportunities for conflicting revisions because a commit to a repository can cause a conflict with a changed revision in that repository there can be conflicts between revisions in different repositories. Only good if there is some advantage to distrusting the repository such as greatly decreased check-in and check-out times

19
Q

Subversion is Centralized or Descentralized?

A

Centralized

20
Q

What kind of commits are in SVN

21
Q

How are SVN repositories referred

A

To using URLs so that clients can get to them across the internet

22
Q

How does SVN record entire directory trees

A

As revisions, so when you commit a file, everything in the directory tree is considered a new revision

23
Q

How does SVN distinguish Revisions

A

Natural numbers (empty project has version 0) first commit is version 1 and so on

24
Q

What happens if someone makes a commit in a project you are working on in SVN?

A

Your working copy will not be modified and you will not get any sort of notice that this has occurred. Must always ask for the latest version by doing an update.
Always update before doing anything

25
What happens if you make changes to the same files as someone else and they have already committed their changes SVN?
When you try to commit the check in will fail. Then you have to update your working copy, which will merge as many changes as it can. Conflicts that it cannot resolve will ask you to resolve manually
26
What kind of tool in SVN/ how can you access its features?
Through the command line
27
What is trunk in SVN contain?
The code that will appear in the next major release
28
What are branches in SVN contain?
Copy of the trunk that is used for active development
29
What is a tag in SVN?
A "frozen" copy of the code that in not used for active development
30
Platform Branches
Made to port the code to a different platform
31
Experimental Branches
Made to try experimental technologies
32
Bug-Fix Branches
Made to correct a serious defect
33
Release Tag
A copy of the code made at release-time
34
Pre-Bug-Fix Tags
A copy of the code made to record its state before a major bug fix
35
Post-Bug-Fix Tags
A copy of code made to record its state after a major bug fix
36
Normal Work Cycle of SVN
Update Modifications/Additions Prior to Check-IN/Commit (update) Check-In/Commit
37
When to Commit?
When a substantial change is made that can stand on its own and all related files should be committed together.