version_control:introduction_to_version_control_systems
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revision | Next revisionBoth sides next revision | ||
| version_control:introduction_to_version_control_systems [2016/11/27 23:32] – mithat | version_control:introduction_to_version_control_systems [2016/11/27 23:37] – mithat | ||
|---|---|---|---|
| Line 47: | Line 47: | ||
| ===== Distributed systems ===== | ===== Distributed systems ===== | ||
| * Replacing centralized systems. | * Replacing centralized systems. | ||
| - | * Use a peer-to-peer architecture. | + | * Uses a peer-to-peer architecture. |
| * Individual users have complete, fully editable repositories. | * Individual users have complete, fully editable repositories. | ||
| * Users synchronize repositories with each other as needed. | * Users synchronize repositories with each other as needed. | ||
| Line 55: | Line 55: | ||
| ===== Revisions ===== | ===== Revisions ===== | ||
| - | * A **revision** | + | * **revision**: a snapshot of the state of a project at a given moment. |
| * When a meaningful change to the code of a project is completed, a **revision** incorporating that change is **committed** (placed) into the repository. | * When a meaningful change to the code of a project is completed, a **revision** incorporating that change is **committed** (placed) into the repository. | ||
| - | * Revisions are also called **commits**, | + | * Also called **commits**, |
| * If needed, differences between the most recent state and older revisions can be determined. | * If needed, differences between the most recent state and older revisions can be determined. | ||
| Line 65: | Line 65: | ||
| ===== Branching ===== | ===== Branching ===== | ||
| - | * **Branching**: making a copy of the project whose development will go in parallel with the original. | + | * **branching**: making a copy of the project whose development will go in parallel with the original. |
| * A branch to test ideas that develops in parallel with the main release. | * A branch to test ideas that develops in parallel with the main release. | ||
| * A branch to develop a bugfix. | * A branch to develop a bugfix. | ||
| Line 71: | Line 71: | ||
| ===== Merging ===== | ===== Merging ===== | ||
| - | * **Merging**: incorporating changes from a different branch or another repository. | + | * **merging**: incorporating changes from a different branch or another repository. |
| * Applying a security update or bugfix developed for a 1.1 release to the 1.0 release. | * Applying a security update or bugfix developed for a 1.1 release to the 1.0 release. | ||
| * Many VCS's facilitate merging. | * Many VCS's facilitate merging. | ||
| Line 80: | Line 80: | ||
| ===== Releases and versions ===== | ===== Releases and versions ===== | ||
| * A revision that has has been published for general use is a **release** or a **version**. | * A revision that has has been published for general use is a **release** or a **version**. | ||
| - | * Not necessarily a VCS concept; often an arbitrary determination made by the developers. | + | * An arbitrary determination made by the developers, not necessarily a VCS concept. |
| * Typically there are several revisions (commits) between releases/ | * Typically there are several revisions (commits) between releases/ | ||
version_control/introduction_to_version_control_systems.txt · Last modified: 2019/02/21 18:52 by mithat