SofiaDev L9 Source Control Management

1,112 views

Published on

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
1,112
On SlideShare
0
From Embeds
0
Number of Embeds
28
Actions
Shares
0
Downloads
12
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

SofiaDev L9 Source Control Management

  1. 1. Работа със системи за управление на сорс кодМартин КуловMicrosoft Regional DirectorMicrosoft Most Valuable Professional
  2. 2. Application Lifecycle Management• Requirements Management• Architecture• Coding• Testing• Tracking• Release Management * Source: Wikipedia
  3. 3. One system to rule them all
  4. 4. Source Control a.k.a. Revision Control a.k.a.Version Control
  5. 5. Items
  6. 6. Repository• Archived folder• Email• File Share• Proprietary• SQL Server
  7. 7. Revision Tools• Microsoft Word• Open Office• Word Press• Drupal• SharePoint
  8. 8. Software ToolsClientServer Distributed• CVSSVN • DCVS• IBM ClearCase • Mercurial• Perforce • Git• Visual SourceSafe • Bazaar• Team Foundation Server • …others• …many others
  9. 9. Workflow GetCreate Latest /Project Pull Check In Check / Out / Commit Lock Init Add / MergeBranch Change Get Latest / Pull
  10. 10. Other Actions• Pending Changes / Outgoing• View History• Diff• Label / Tag• Undo Changes / Revert• Track Changeset / View Commit
  11. 11. DEMO: SOURCE CONTROLOPERATIONS
  12. 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. 13. Common Branching Strategies
  14. 14. Branch per Release* Source: MSDN
  15. 15. Code-Promotion Branches* Source: MSDN
  16. 16. Branch per Task* Source: MSDN
  17. 17. Branch per Component* Source: MSDN
  18. 18. Branch per Technology* Source: MSDN
  19. 19. Thoughts on DVCS“To me, the fact that they make branchingand merging easier just means that yourcoworkers are more likely to branch andmerge, and you’re more likely to beconfused.”* Eric Sink on the Stack Overflow Podcast
  20. 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. 21. DEMO: BRANCHING ANDMERGING
  22. 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. 23. JOIN US ON FACEBOOKSOFIADEV .NET USER GROUP
  24. 24. THANK YOU!

×