Download as PDF, PPTX
More Related Content
Similar to JAZOON'13 - Stefan Saasen - True Git: The Great Migration
JAZOON'13 - Stefan Saasen - True Git: The Great Migration
- 1.
- 2. TODO Show ofhands Picture with hands/lighter/concert
- 3.
- 4. Source Control Management 2011 2013(projected) SVN 2013 Git 2015 (projected)
- 5. Source Control Management 78 20 2011 2013(projected) SVN 2013 Git 2015 (projected)
- 6. Source Control Management 78 68 41 20 2011 2013(projected) SVN 2013 Git 2015 (projected)
- 7. Source Control Management 78 70 68 49 41 20 2011 2013(projected) SVN 2013 Git 2015 (projected)
- 8. Source Control Management 78 70 68 68 49 41 55 20 2011 2013(projected) SVN 2013 Git 2015 (projected)
- 9. Stefan Saasen Atlassian StashDevelopment Lead
- 10. Stefan Saasen Atlassian StashDevelopment Lead I come out nice in pictures, I know :-). @stefansaasen
- 11. Why am Ipassionate about this?
- 12.
- 13.
- 14. Branching & Merging fast,cheap and simple
- 15. first class concept Branching& Merging fast, cheap and simple
- 16. first class concept Branching& Merging fast, cheap and simple
- 17.
- 18.
- 19.
- 20. git bisect Speed git log gitstatus git diff
- 21.
- 22.
- 23.
- 24.
- 25.
- 26.
- 27. Regression! git bisect Fast graphtraversal Fast checkout
- 28. git bisect Speed git log gitstatus git diff
- 29. Enables new features Improvesbasic features
- 30.
- 31. Edit & Publish Localcommits
- 32. Edit & Publish Localcommits Rewrite History
- 33. Edit & Publish Localcommits Rewrite History
- 34.
- 35. Git does whatyou are doing today, only better
- 36.
- 37.
- 38.
- 39. GIT SVN LABEL TITLE Existing workflows New waysof collaborating
- 40. GIT SVN LABEL TITLE Existing workflows New branch workflows Newways of collaborating
- 41. GIT SVN LABEL TITLE Existing workflows New branch workflows Newways of collaborating
- 42. GIT SVN LABEL TITLE Existing workflows New branch workflows Newways of collaborating
- 43. GIT SVN LABEL TITLE Existing workflows New branch workflows Newways of collaborating
- 44.
- 45.
- 46.
- 47.
- 48.
- 49.
- 50. Real World git workflows StefanSaasen Wednesday - 14:00
- 52. So you’ve decidedto migrate!
- 53.
- 54.
- 55. Inception • Is gitsuitable? 1
- 56. Inception • Is gitsuitable? • Test the conversion 1
- 57. Inception • Is gitsuitable? • Test the conversion • Identify the repositories that need to be converted 1
- 58. Inception • Is gitsuitable? • 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 1
- 59.
- 60.
- 61.
- 62. Adoption • You needto answer: “What’s in it for me” 2
- 63. Adoption • You needto answer: “What’s in it for me” • Make sure tooling is ready and can be used by everyone 2
- 64. Adoption • You needto 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 2
- 65. Adoption • You needto 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 2
- 66.
- 67. 2 Just text byitself, for impact.
- 68.
- 69. We’ve got youcovered! & Scripts Tutorial & Documentation
- 70. We’ve got youcovered! & Scripts Tutorial & Documentation bit.ly/go-dvcs
- 71.
- 72.
- 73. Conversion - Preparation 3 MapAuthors jdeveloper = John Developer <jd@example.com>
- 74. Conversion - Preparation 3 MapAuthors jdeveloper = John Developer <jd@example.com> /tags /trunk /branches Identify SVN repository layout
- 75. Conversion - InitialClone 3 git svn clone --authors-file=/authors.txt --trunk=/trunk --tags=/tags --branches=/branches
- 76. Conversion - InitialClone ? 3 git svn clone --authors-file=/authors.txt --trunk=/trunk --tags=/tags --branches=/branches
- 77.
- 78.
- 79. Conversion - Sync gitsvn fetch 3
- 80.
- 81.
- 82.
- 83. Infrastructure first read-only Sync everyminute CI Issues IDE 3
- 84. Conversion - Cleanup •Cleanup branches • Remove unused files • Create git tags • Remove commit metadata 3
- 85. Conversion - Cleanup •Cleanup branches • Remove unused files • Create git tags • Remove commit metadata 3
- 86.
- 87.
- 88.
- 89.
- 90.
- 91.
- 92.
- 93.
- 94. Collaboration model? Branching model? Justtext by itself, for impact.
- 95.
- 96.
- 97.
- 98.
- 99. for the better Workflowswill change
- 100. for the better Workflowswill change but they don’t have to change on day one!
- 101. This happened inboth Confluence and JIRA...
- 102.
- 103. From SVN like gitcherry-pick bae6251 confluence-project-4.0 CONF-1234 master
- 104. From SVN like gitcherry-pick bae6251 confluence-project-4.0 CONF-1234 master
- 105.
- 106.
- 107. To git branchbased workflow confluence-project-4.1 master
- 108. To git branchbased workflow confluence-project-4.1 master
- 109. To git branchbased workflow confluence-project-4.1 CONF-2345 master
- 110. To git branchbased workflow git merge confluence-project-4.1 confluence-project-4.1 CONF-2345 master
- 111. To git branchbased workflow confluence-project-4.1 CONF-2345 master
- 112. To git branchbased workflow git merge confluence-project-4.1 confluence-project-4.1 CONF-2345 master
- 113.
- 114.
- 115.
- 116. “ Subversion (58%) isbeing threatened by Git (47%) for de facto leadership of the Version Control space. ” ZEROTURNAROUND DEVELOPER PRODUCTIVITY REPORT 2013
- 117. is here tostay
- 118.
- 119. migration is a solvedproblem
- 120. Thank you foryour attention! @stefansaasen ssaasen@atlassian.com www.atlassian.com
- 121.