+ Follow

Source Control Concepts

by Christopher Bennage on Sep 01, 2009

2,240 views

An introduction into the basic concepts of source control. Some specific examples are in Subversion (svn).

More…

An introduction into the basic concepts of source control. Some specific examples are in Subversion (svn).

Less

9 Embeds 245

http://devlicio.us	98
http://wpfpatterns.codeplex.com	94
http://devlicious.com	36
http://www.bluespire.com	8
http://www.slideshare.net	4
http://www.codeplex.com	2
http://bluespire.com	1
http://www.foundingbloggers.com	1
http://www.hanrss.com	1

More...

Statistics

Favorites: 1
Downloads: 0
Comments: 0
Embed Views: 245
Views on SlideShare: 1,995
Total Views: 2,240

Source Control Concepts — Presentation Transcript

Source Control Conceptswith examples in Subversion
devlicio.us
bennage
Christopher Bennage
Blue Spire Consulting, Inc.
Microsoft MVP

there areSurprising Benefits

Communication of intent
Assistance with fixing bugs
Liberation
Encouragement of best practices

Repository
File System * Time

Working Copy

worfklow #1Check-out, Edit, Check-in
Check out the files to edit
Edit them
Check them back in

worfklow #2Edit, Merge, Commit
Update your working copy
Make your edits
(Resolve any conflicts)
Commit the changes

but alwaysComment!
Comments are the key to understanding your project’s history.

Conflicts will happen
Conflicts will happen

what isBranching?
r1
Begin
Development
r2
r1.01

mergingBranches
r1
Begin
Development
r2
r1.01
bug fixes

Tags
Tags mark special moments in the history of the code.

official release
just prior to breaking changes

Tags shouldn’t change.

A few other things…

head
revision
atomic commit
changeset
blame
patch

Subversion Resources
VisualSVNvisualsvn.com
easiest way to get started
TortoiseSVNtortoisesvn.tigris.org
popular UI for svn
Subversion subversion.tigris.org
svn client and server
“Red Bean” Book svnbook.red-bean.com
The manual for Subversion
Unfuddleunfuddle.com
hosted project management with svn

Git Resources
msysgitcode.google.com/p/msysgit
git for windows
Git Extensions sourceforge.net/projects/gitextensions
includes a Visual Studio plugin
GitHubgithub.com
social coding with git
Unfuddleunfuddle.com
hosted project management with git
Git Community Book book.git-scm.com
the manual for git

TFS Resources
Microsoft msdn.microsoft.com/en-us/teamsystem
Team System Home
Radio TFS radiotfs.com
podcasts about TFS
Team System Rocks teamsystemrocks.com
community site with tutorials and blogs

General Resources
Eric Sink ericsink.com/scm
How To guide for Source Control
Branching Primer msdn.microsoft.com/library/aa730834
primer regarding branching and merging
Visual Guide to Version Control
betterexplained.com/articles/a-visual-guide-to-version-control
An excellent overview of source control

Christopher Bennagedevlicio.us/blogs/christopher_bennage christopher@bluespire.comtwitter.com/bennageMicrosoft MVP

Source Control Concepts

by Christopher Bennage on Sep 01, 2009

Accessibility

Categories

Tags

Upload Details

Usage Rights

9 Embeds 245

Statistics

Source Control Concepts — Presentation Transcript