This document discusses source code management systems. It covers the application lifecycle including requirements, architecture, coding, testing, tracking and release management. It then discusses source control/version control systems including repositories, revision tools and software tools for both client-server and distributed version control systems. It provides examples of common source control workflows and operations. It also discusses branching strategies and potential issues with branching and merging.

1. Работа със системи за
управление на сорс код
Мартин Кулов
Microsoft Regional Director
Microsoft Most Valuable Professional

2. Application Lifecycle Management
• Requirements Management
• Architecture
• Coding
• Testing
• Tracking
• Release Management
* Source: Wikipedia

3. One system to rule them all

4. Source Control
a.k.a.
Revision Control
a.k.a.
Version Control

5. Items

6. Repository
• Archived folder
• Email
• File Share
• Proprietary
• SQL Server

7. Revision Tools
• Microsoft Word
• Open Office
• Word Press
• Drupal
• SharePoint

8. Software Tools
ClientServer Distributed
• CVSSVN • DCVS
• IBM ClearCase • Mercurial
• Perforce • Git
• Visual SourceSafe • Bazaar
• Team Foundation Server • …others
• …many others

9. Workflow
Get
Create Latest /
Project Pull
Check In Check
/ Out /
Commit Lock
Init
Add /
Merge
Branch Change
Get
Latest /
Pull

10. Other Actions
• Pending Changes / Outgoing
• View History
• Diff
• Label / Tag
• Undo Changes / Revert
• Track Changeset / View Commit

11. DEMO: SOURCE CONTROL
OPERATIONS

12. What is a branch?
• “A branch is what happens when your
development team needs to work on two
distinct copies of a project at the same
time.”
Eric Sink – Source Control HOWTO

13. Common Branching
Strategies

14. Branch per Release
* Source: MSDN

15. Code-Promotion Branches
* Source: MSDN

16. Branch per Task
* Source: MSDN

17. Branch per Component
* Source: MSDN

18. Branch per Technology
* Source: MSDN

19. Thoughts on DVCS
“To me, the fact that they make branching
and merging easier just means that your
coworkers are more likely to branch and
merge, and you’re more likely to be
confused.”
* Eric Sink on the Stack Overflow Podcast

20. Branching and Merging
Anti-Patterns
• Merge Paranoia
• Merge Mania
• Big Bang Merge
• Never-Ending Merge
• Wrong-Way Merge
• Branch Mania
• Cascading Branches
• Mysterious Branches
• Temporary Branches
• Volatile Branches
• Development Freeze
• Berlin Wall
* Source: MSDN

21. DEMO: BRANCHING AND
MERGING

22. Resources
• http://en.wikipedia.org/wiki/Application_lifecycle_management
• http://en.wikipedia.org/wiki/Revision_control
• http://en.wikipedia.org/wiki/List_of_revision_control_software
• http://betterexplained.com/articles/a-visual-guide-to-version-
control/
• http://www.ericsink.com/scm/source_control.html
• http://msdn.microsoft.com/en-
US/library/aa730834(v=VS.80).aspx
• http://www.cmcrossroads.com/bradapp/acme/branching/
• http://branchingguidance.codeplex.com/

23. JOIN US ON FACEBOOK
SOFIADEV .NET USER GROUP

24. THANK YOU!