Source Control Management 101

A introduction to source control management

Transcript

1. Filipe Moura filipe.moura@noesis.pt October 2013 SOURCE CODE MANAGEMENT 101 1
2. WHO AM I... • Name: Filipe Moura • AKA: supermoura • From: Porto - Portugal 2
3. DISCLAIMER The names and scenarios presented here are purely fictional. Any similarity to real people or scenarios is purely a coincidence. No animals were harmed during the making of this Workshop. 3
4. WHY SOURCE CONTROL? WHY DON’T SOURCE CONTROL? 4
5. THE DRUNKEN MISTAKES WE ALL MAKE AND REGRET THE NEXT MORNING 5
6. THE DRUNKEN MISTAKES WE ALL MAKE AND REGRET THE NEXT MORNING 6
7. THE DRUNKEN MISTAKES WE ALL MAKE AND REGRET THE NEXT MORNING 7
9. SOURCE CONTROL AKA VERSION CONTROL AKA REVISION CONTROL When you mess up you can easily get back to a previous working version. 9
10. WHAT IS SOURCE CONTROL IN IT PROJECT? 10
11. SOURCE CONTROL IN IT PROJECT Is only for geeks & programmers? 11
12. SOURCE CONTROL IN IT? Is only for geeks & programmers? NO… It’s for everyone (even if they don’t know what they doing) 12
13. ALMOST EVERYONE USE A SOURCE CONTROL SYSTEM METHOD You’ve probably used your own version control system method without realizing it. Recognize this? • My Document.doc • My Document - Copy.doc • My Document – Copy(2).doc • My Document - Copy(3).doc • My photo.jpg • My photo2.jpg • My photo New.jpg 13
14. ALMOST EVERYONE USE A SOURCE CONTROL SYSTEM METHOD You’ve probably used your own version control system method without realizing it. Recognize this? • My Document.doc • My Document - Copy.doc • My Document – Copy(2).doc • My Document - Copy(3).doc • My photo.jpg • My photo2.jpg • My photo New.jpg Is this method the best solution? 14
15. WHY I MUST USE A SOURCE CONTROL SYSTEM? WHY DO I NEED A SOURCE CONTROL SYSTEM? 15
16. REASON #1: DANGER 16
17. REASON #2: HISTORY 17
18. REASON #3: COLLABORATION 18
19. REASON #4: TRACK OWNERSHIP 19
20. REASON #5: BRANCH AND MERGING 20
21. WHAT SHOULD I CONTROL? 21
22. WHAT SHOULD I CONTROL? ANYTHING 22
23. WHAT SHOULD I CONTROL? ANYTHING EVERYTHING 23
24. TERMINOLOGY Repository Server Client Trunk/Main Head Revision Baseline Change set Branch Push Pull Add Revert Check Out/In Check Message Changelog History Diff Merge Update Commit Conflict Resolve Tag 24
25. TRUNK/MAIN: TREE OF LIFE 25
26. BRANCH: DIVIDE YOUR PATH 26
27. DIFF: SPOT THE DIFFERENCES 27
28. MERGE: JOIN YOUR PIECES 28
29. CONFLICT: CONTRADICTIONS WILL APPEAR 29
30. RESOLVE: SOMEONE HAS TO FIX AND CORRECT 30
31. REVERT: CAN ALWAYS DISCARD AND RESTART 31
32. TAG: GIVE A NAME TO SPECIAL MOMENTS 32
33. TYPES OF VERSION CONTROL SYSTEMS (VCS) The two most famous types of version control systems are: • Centralized version control system (CVCS) • Distributed or decentralized version control system (DVCS) 33
34. CENTRALIZED VERSION CONTROL SYSTEM - CVCS 34
35. CENTRALIZED VERSION CONTROL SYSTEM - CVCS 35
36. DISTRIBUTED VERSION CONTROL SYSTEM - DVCS 36
37. DISTRIBUTED VERSION CONTROL SYSTEM - DVCS 37
38. QUICK COMPARISON MATRIX File CVCS DVCS Networking None Centralized Distributed 38
39. QUICK COMPARISON MATRIX File CVCS DVCS Networking None Centralized Distributed Operations One file per time Multi-file Changesets 39
40. QUICK COMPARISON MATRIX File CVCS DVCS Networking None Centralized Distributed Operations One file per time Multi-file Changesets Concurrency Locks Merge before commit Commit before merge 40
41. QUICK COMPARISON MATRIX File CVCS DVCS Networking None Centralized Distributed Operations One file per time Multi-file Changesets Concurrency Locks Merge before commit Commit before merge Examples RCS, SCCS CVS, SourceSafe, Subversion,Team Foundation Server Bazaar, Git, Mercurial 41
42. WHAT IS IN PRACTICE... Imges from http://betterexplained.com/ 42
50. EXAMPLE... 50
53. 53 THANK YOU