CSC/ECE 517 Fall 2010/ch1 1a vc: Difference between revisions

From Expertiza_Wiki
Jump to navigation Jump to search
No edit summary
No edit summary
Line 8: Line 8:
==Taxonomy of Version Control==
==Taxonomy of Version Control==


Branch: When the development team needs to work on two distinct copies of a project, a branch is created. <ref>[http://www.ericsink.com/scm/scm_branches.html]</ref> {return} The branch is a replica of the existing code at the time of its creation. On creation of the branch, changes made to a branch are confined to it and are not visible in any other branch.
<b>Branch</b>: When the development team needs to work on two distinct copies of a project, a branch is created. <sup>[4]</sup> The branch is a replica of the existing code at the time of its creation. On creation of the branch, changes made to a branch are confined to it and are not visible in any other branch.
   
   
Repository: Repository is the data store where all the versions of all the files in the project are stored. A repository may be centralized or distributed.
<b>Repository</b>: Repository is the data store where all the versions of all the files in the project are stored. A repository may be centralized or distributed.
   
   
Check-Out: Creating a working copy of the files in the repository on a local machine is called Check-out. Every user who checks out a file has a working copy of the file on his computer. Changes made to the working copy are not visible to the team members
<b>Check-Out</b>: Creating a working copy of the files in the repository on a local machine is called Check-out. Every user who checks out a file has a working copy of the file on his computer. Changes made to the working copy are not visible to the team members
   
   
Check-In: Putting back the edited files to the repository for use by everybody is called Check-In   
<b>Check-In</b>: Putting back the edited files to the repository for use by everybody is called Check-In   


Merge:  Merging is the process of combining different working copies of the file into the repository.[3] Each developer is allowed to work on their independent working copies, and  everyone’s changes to a single file are combined by merging
<b>Merge</b>:  Merging is the process of combining different working copies of the file into the repository.[3] Each developer is allowed to work on their independent working copies, and  everyone’s changes to a single file are combined by merging
   
   
Label: A label is an identifier given to a branch when created. Also known as Tag
<b>Label</b>: A label is an identifier given to a branch when created. Also known as Tag
   
   
Trunk: The highest location of the repository is called Trunk.
<b>Trunk</b>: The highest location of the repository is called Trunk.




==History==
<b>Source Code Control System (SCCS)</b>
The exact time in history when and how the version systems came about into existence is unclear. However, we can estimate roughly that the version control system can be rooted to the <b>Source Code Control System (SCCS)</b> <sup>[3],[6]</sup>. It was developed by the Bell Labs in 1972. It is no longer prevalent, but the file format is still internally used today by other softwares like <i>BitKeeper</i> and <i>Sablime</i><sup>[6]</sup>
<b>Revision Control System(RCS)</b>
The next generation of Version control system was the RCS. It was first released in 1982, and developed by Walter F. Tichy of Purdue University. It was considered to be a better version of SCCS. Also, the version syntax was very complicated. Usually the developers employed locking mechanism, and worked on a single branch(head).
One situation where RCS could prove to be useful is while a single user needs to work on a project. As RCS does not demand a central repository to be set up, and the administration and maintenance of files is easy, hence, it is easy.
The limitations of RCS were that RCS could only work on a single file. There was no way that multiple files in a project could be versioned.
<b></b>
== References ==
== References ==
*[1]: [http://en.wikipedia.org/wiki/Revision_control Revision Control Wikipedia]
*[1]: [http://en.wikipedia.org/wiki/Revision_control Revision Control Wikipedia]
Line 29: Line 47:
*[4]: [http://www.ericsink.com/scm/scm_branches.html]
*[4]: [http://www.ericsink.com/scm/scm_branches.html]
*[5]: [http://www.tigris.org/nonav/scdocs/ddCVS_cvsglossary.html]
*[5]: [http://www.tigris.org/nonav/scdocs/ddCVS_cvsglossary.html]
*[6]: [http://en.wikipedia.org/wiki/Source_Code_Control_System]
*[7] :[http://en.wikipedia.org/wiki/Revision_Control_System]

Revision as of 02:32, 6 September 2010

Introduction

Versioning Systems are typically used in a software facility(s), and employed for the primary purposes of collaborative work. While working on a project with common resources (files, folders, information etc.), it becomes essential to put a definite order on the sanctity of the data if the resources are editable.

For example, if there are 10 people working on an assignment, and 3 people are working on the same file. It becomes important on how they can add/modify data such that all are neither locked out waiting for a lock put by anyone, nor there is any inconsistency in the data.

Version control systems typically let us create versions of the resources, where each developer can work on a different version, therefore providing the flexibility. There are a whole bunch of features provided by the new Versioning Systems. We shall look at the evolution and history of the same in the subsequent sections.

Taxonomy of Version Control

Branch: When the development team needs to work on two distinct copies of a project, a branch is created. [4] The branch is a replica of the existing code at the time of its creation. On creation of the branch, changes made to a branch are confined to it and are not visible in any other branch.

Repository: Repository is the data store where all the versions of all the files in the project are stored. A repository may be centralized or distributed.

Check-Out: Creating a working copy of the files in the repository on a local machine is called Check-out. Every user who checks out a file has a working copy of the file on his computer. Changes made to the working copy are not visible to the team members

Check-In: Putting back the edited files to the repository for use by everybody is called Check-In

Merge: Merging is the process of combining different working copies of the file into the repository.[3] Each developer is allowed to work on their independent working copies, and everyone’s changes to a single file are combined by merging

Label: A label is an identifier given to a branch when created. Also known as Tag

Trunk: The highest location of the repository is called Trunk.


History

Source Code Control System (SCCS)

The exact time in history when and how the version systems came about into existence is unclear. However, we can estimate roughly that the version control system can be rooted to the Source Code Control System (SCCS) [3],[6]. It was developed by the Bell Labs in 1972. It is no longer prevalent, but the file format is still internally used today by other softwares like BitKeeper and Sablime[6]

Revision Control System(RCS)

The next generation of Version control system was the RCS. It was first released in 1982, and developed by Walter F. Tichy of Purdue University. It was considered to be a better version of SCCS. Also, the version syntax was very complicated. Usually the developers employed locking mechanism, and worked on a single branch(head).

One situation where RCS could prove to be useful is while a single user needs to work on a project. As RCS does not demand a central repository to be set up, and the administration and maintenance of files is easy, hence, it is easy.



The limitations of RCS were that RCS could only work on a single file. There was no way that multiple files in a project could be versioned.

References