Intro to version control systems

1. Version Control Systems
T Shrinivasan
tshrinivasan@gmail.com
shrinivasan@collab.net

2. Three Generations of Version
Control
Generation Networking Operations Concurrency Examples
First None One file at a time Locks RCS, SCCS
Second Centralized Multi-file Merge
before
commit
CVS,
SourceSafe,
Subversion,
Team
Foundation
Server
Third Distributed Changesets Commit
before
merge
Bazaar,
Git,
Mercurial

3. Basics

4. Create
Create a new, empty repository.
repository = filesystem * time

5. Checkout
Create a working copy.

6. Checkout

7. Commit
Apply the modifications in the working copy to
the repository as a new changeset.

8. Commit

9. Update
Update the working copy with respect to the
repository.

10. Add
Add a file or directory.

11. Edit
Modify a file.

12. Delete
Delete a file or directory.

13. Rename
Rename a file or directory.

14. Move
Move a file or directory.

15. Status
List the modifications that have been made to
the working copy.

16. Diff
●
Show the details of the modifications that have
been made to the working cop

17. Diff

18. Revert
Undo modifications that have been made to the
working copy.

19. Log
Show the history of changes to the repository.

20. Tag
Associate a meaningful name with a specific
version in the repository.

21. Tag

22. Branch
Create another line of development.

23. Branch

24. Merge
Apply changes from one branch to another.

25. Merge

26. Conflicts

27. Resolve
Handle conflicts resulting from a merge.

28. Lock
Prevent other people from modifying a file.

29. Some Commands
●
Svn checkout <url> <path>
●
Svn commit -m “log”
●
Svn list
●
Svn add
●
Svn delete
●
Svn diff
●
Svn status
●
Svn log PATH
●
Svn move src dest
●
Svn update

30. Images Courtesy
●
http://www.ericsink.com/vcbe/
●
http://betterexplained.com/articles/a-visual-guide-to-version-control/