True Git - The great migration

Jazoon 2013: http://jazoonvote.appspot.com/#/submissions/175

Transcript

1. True The great migration Stefan Saasen
2. TODO Show of hands Picture with hands/lighter/concert
3. Source Control Management SVN Git
4. Source Control Management 2011 2013 (projected) 2013 2015 (projected) SVN Git
5. Source Control Management 2011 2013 (projected) 2013 2015 (projected) 20 78 SVN Git
6. Source Control Management 2011 2013 (projected) 2013 2015 (projected) 20 78 41 68 SVN Git
7. Source Control Management 2011 2013 (projected) 2013 2015 (projected) 20 78 41 68 49 70 SVN Git
8. Source Control Management 2011 2013 (projected) 2013 2015 (projected) 20 78 41 68 49 70 68 55 SVN Git
9. Stefan Saasen Atlassian Stash Development Lead
10. Stefan Saasen Atlassian Stash Development Lead I come out nice in pictures, I know :-). @stefansaasen
11. Why am I passionate about this?
12. Why Git?
13. Branching & Merging
14. Branching & Merging fast, cheap and simple
15. Branching & Merging fast, cheap and simple first class concept
16. Branching & Merging fast, cheap and simple first class concept
17. Foundation for new workflows
18. Speed
19. Speed git log git diff git status
20. Speed git bisect git log git diff git status
21. git bisect
22. Bad git bisect
23. Bad Good (v2.7) git bisect
24. Bad Test git bisect
25. Bad Test git bisect
26. Bad Regression! git bisect
27. Regression! Fast graph traversal Fast checkout git bisect
28. Speed git bisect git log git diff git status
29. Enables new features Improves basic features
30. Local commits
31. Local commits Edit & Publish
32. Local commits Rewrite History Edit & Publish
33. Local commits Rewrite History Edit & Publish
34. Flexibility
35. Git does what you are doing today, only better
36. SVN
37. LABEL TITLE GIT SVN
38. LABEL TITLE GIT SVN Existing workflows
39. LABEL TITLE GIT SVN New ways of collaborating Existing workflows
40. LABEL TITLE GIT SVN New ways of collaborating Existing workflows New branch workflows
41. LABEL TITLE GIT SVN New ways of collaborating Existing workflows New branch workflows
42. LABEL TITLE GIT SVN New ways of collaborating Existing workflows New branch workflows
43. LABEL TITLE GIT SVN New ways of collaborating Existing workflows New branch workflows
44. Release branching master 2.8 2.7
45. Release branching master 2.8 2.7 Bugfix
46. Release branching master 2.8 2.7  Bugfix
47. Release branching master 2.8 2.7  Bugfix
48. Release branching master 2.8 2.7  Bugfix
49. Release branching master 2.8 2.7  Bugfix
50. Real World git workflows S t e f a n S a a s e n W e d n e s d a y - 1 4 : 0 0
52. So you’ve decided to migrate!
53. The process 1 2 3 Inception Adoption Conversion
54. Inception 1
55. • Is git suitable? Inception 1
56. • Is git suitable? • Test the conversion Inception 1
57. • Is git suitable? • Test the conversion • Identify the repositories that need to be converted Inception 1
58. • Is git suitable? • Test the conversion • Identify the repositories that need to be converted • Identify the tools that need to be updated. CI, issue tracking, IDE, scripts and build tools, deployment tools Inception 1
60. 1 2 3 The process Inception Adoption Conversion
61. Adoption 2
62. • You need to answer: “What’s in it for me” Adoption 2
63. • You need to answer: “What’s in it for me” • Make sure tooling is ready and can be used by everyone Adoption 2
64. • You need to answer: “What’s in it for me” • Make sure tooling is ready and can be used by everyone • Identify the git champions - they will be thrilled to help Adoption 2
65. • You need to answer: “What’s in it for me” • Make sure tooling is ready and can be used by everyone • Identify the git champions - they will be thrilled to help • Don’t expect to win everyone over immediately Adoption 2
67. Just text by itself, for impact. 2
68. 1 2 3 The process Inception Adoption Conversion
69. We’ve got you covered! & Scripts Tutorial & Documentation
70. We’ve got you covered! & Scripts Tutorial & Documentation bit.ly/go-dvcs
71. git-svn 3
72. 3 Conversion - Preparation
73. jdeveloper = John Developer <jd@example.com> Map Authors 3 Conversion - Preparation
74. jdeveloper = John Developer <jd@example.com> Map Authors Identify SVN repository layout /tags /trunk /branches 3 Conversion - Preparation
75. git svn clone \ --authors-file=/authors.txt \ --trunk=/trunk \ --tags=/tags \ --branches=/branches 3 Conversion - Initial Clone
76. git svn clone \ --authors-file=/authors.txt \ --trunk=/trunk \ --tags=/tags \ --branches=/branches 3 Conversion - Initial Clone ?
77. 3 Conversion - Sync
78. 3 Conversion - Sync
79. git svn fetch 3 Conversion - Sync
80. Infrastructure first 3 CI Issues IDE
81. Infrastructure first 3 CI Issues IDE read-only
82. Infrastructure first 3 CI Issues IDE read-only
83. Infrastructure first 3 CI Issues IDE read-only Sync every minute
84. • Cleanup branches • Remove unused files • Create git tags • Remove commit metadata 3 Conversion - Cleanup
85. • Cleanup branches • Remove unused files • Create git tags • Remove commit metadata 3 Conversion - Cleanup
86. 3 CI Issues IDE read-only
87. Then your team 3 CI Issues IDE read-only
88. Then your team 3 CI Issues IDE read-only
89. Then your team 3 CI Issues IDE read-only
90. Other Tools?
91. SubGit
92. 1 2 3 The process Inception Adoption Conversion
93. Or are you?
94. Just text by itself, for impact. Collaboration model? Branching model?
95. + Enterprise
96. Centralized = + Enterprise
97. Centralized = + Enterprise Builds Metrics Issues Deployments
98. Workflows will change
99. Workflows will change for the better
100. Workflows will change for the better but they don’t have to change on day one!
101. This happened in both Confluence and JIRA...
102. master confluence-project-4.0 CONF-1234 From SVN like
103. master confluence-project-4.0 CONF-1234 git cherry-pick bae6251 From SVN like
104. master confluence-project-4.0 CONF-1234 git cherry-pick bae6251 From SVN like
105. master confluence-project-4.0 CONF-1234 From SVN like
106. master confluence-project-4.0 CONF-1234 From SVN like
107. master confluence-project-4.1 To git branch based workflow
108. master confluence-project-4.1 To git branch based workflow
109. master confluence-project-4.1 CONF-2345 To git branch based workflow
110. master confluence-project-4.1 CONF-2345 git merge confluence-project-4.1 To git branch based workflow
111. master confluence-project-4.1 CONF-2345 To git branch based workflow
112. master confluence-project-4.1 CONF-2345 git merge confluence-project-4.1 To git branch based workflow
113. Conclusion
114. 0 20 40 60 80 2011 2013 (projected) 2013 2015 (projected) 68 49 41 20 55 70 68 78 SVN Git
115. 0 20 40 60 80 2011 2013 (projected) 2013 2015 (projected) 68 49 41 20 55 70 68 78 SVN Git
116. Subversion (58%) is being threatened by Git (47%) for de facto leadership of the Version Control space. ZEROTURNAROUND DEVELOPER PRODUCTIVITY REPORT 2013 ” “
117. is here to stay
118. expands
119. migration is a solved problem
120. Thank you for your attention! @stefansaasen ssaasen@atlassian.com www.atlassian.com
121. Image credits http://www.flickr.com/photos/marfis75/3272079115/sizes/o/ http://www.flickr.com/photos/al-taqi/4135841914/ http://www.flickr.com/photos/duremi/3200067353/sizes/o/