Subversion in a distributed world
- 1. Subversion in a Distributed World
- 2. About Me Lorna Mitchell
- 3. PHP Developer/Trainer/Consultant at Ibuildings
- 4. Host of Dutch PHP Conference 2010
- 7. Personal blog: http://lornajane.net
- 9. Source Control Keeping-place for code
- 11. Project archive
- 13. Integration point for development
- 15. One True Way
- 17. The Products
- 18. Subversion (svn) Creator CollabNet URL Maintainer Apache Users PHP Sourceforge FreeBSD Apache Software Foundation License Apache/BSD style Documentation Excellent, more mature Red Bean Book
- 19. Subversion: The Roapmap Taken from: http://lwn.net/Articles/381794/ Subversion exists to be universally recognized and adopted as an open-source, centralized version control system characterized by its reliability as a safe haven for valuable data; the simplicity of its model and usage; and its ability to support the needs of a wide variety of users and projects, from individuals to large-scale enterprise operations.
- 20. Git Creator Linus Torvalds URL Maintainer Junio Hamano Users Linux kernel Ruby on Rails CakePHP Debian GNOME License GPL Documentation "terse", a lot of documentation for an unfamiliar system
- 21. Bazaar (bzr) Creator Martin Pool URL Maintainer Canonical Users Ubuntu MySQL Inkscape Squid License GPL Documentation Excellent! Aimed at beginners, UI designed to be intuitive
- 22. Mercurial (hg) Creator Matt Mackall URL Maintainer Matt Mackall Users Mozilla OpenOffice.org SymbianOS NetBeans License GPL Documentation Good, online book and command line help
- 24. File renames
- 25. Symbolic links
- 27. Merge tracking
- 28. Tags
- 29. EOL conversions
- 30. Protocols Everything supports SSH and HTTP(S)
- 31. Distributed systems support email
- 34. Centralised vs Distributed Source Control
- 36. Centralised Source Control Traditional model
- 38. Other products can do it
- 41. Distributed Source Control Git, Bazaar and Mercurial are distributed
- 43. Move changes between any or all of these
- 44. Revisions vs Changes From a Joel Spolsky post: With distributed version control, the distributed part is actually not the most interesting part. The interesting part is that these systems think in terms of changes, not in terms of versions
- 45. Repo Structure: SVN Top level projects
- 46. Branches, tags and trunk
- 47. Can check out and commit at subdirectory level
- 48. Repo Structure: DVCS Separate repository per project
- 49. Can only check out the whole thing
- 50. Controlled at the top level
- 51. Can safely copy directories :)
- 52. Referring to Revisions svn: whole repo increments with every change
- 53. git: generates a SHA1, a 40 character hexadecimal string
- 54. bzr: uses per branch incrementing revision numbers
- 55. hg: sequential revision number AND unique changeset ID in a SHA1
- 56. Git Hashing Every commit has an identifying hash
- 57. Hash is of commit and includes information about parent
- 58. Any change in any version is seen later, because parental hashes change
- 60. Hashing: Branch 1 commit 69540cd8d2dda61424982d388976c2b3c95d4278 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:56:03 2010 +0100 fixes coding standards compatibility commit 482fc8d3de1b523c6aa44d0f0a6b97ced9273499 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:51:53 2010 +0100 creating the hello world file
- 61. Hashing: Branch 2 commit 24ab6108e42f7662cf32c14e0e707c5534dec47c Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:55:14 2010 +0100 extends greeting to universe commit 67681edee47744780010ecf9e085c0f097a32e11 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:54:36 2010 +0100 formalises world greeting commit 482fc8d3de1b523c6aa44d0f0a6b97ced9273499 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:51:53 2010 +0100 creating the hello world file
- 62. Hashing: Merged Changes commit baa58ead49d46ac10d360e9d83fd6603c0f57061 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:56:03 2010 +0100 fixes coding standards compatibility commit 24ab6108e42f7662cf32c14e0e707c5534dec47c Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:55:14 2010 +0100 extends greeting to universe commit 67681edee47744780010ecf9e085c0f097a32e11 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:54:36 2010 +0100 formalises world greeting commit 482fc8d3de1b523c6aa44d0f0a6b97ced9273499 Author: Lorna <lorna@lornajane.net> Date: Sat Apr 17 20:51:53 2010 +0100 creating the hello world file
- 64. Cherry Picking Example $ git fetch origin remote: Counting objects: 5, done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From /home/lorna/git_examples2/../git_examples 482fc8d..69540cd master -> origin/master $ git cherry-pick 69540cd8d2dda61424982d388976c2b3c95d4278
- 66. Local Repo: Advantages Its FAST
- 67. Can see and diff against history while offline
- 68. Commit offline, then share these later
- 69. Tools
- 70. Building Bridges Bridge between SVN repo and local bzr-svn https://launchpad.net/bzr-svn
- 71. git-svn http://www.kernel.org/pub/software/scm/git/docs/git-svn.html Local distributed-style repo
- 72. Communicates with central SVN server
- 73. Pulls complete history diff, log fast and offline Work offline, commit later
- 74. bzr-svn: Setting the Scene Subversion repository
- 75. Standard svn checkout in subversion/
- 76. Bzr checkout in /lorna-repo/lorna-trunk
- 77. Branch of this in /lorna-repo/lorna-branch
- 78. bzr-svn: Adding Content with Bzr $ bzr commit -m "initialising database files and hello.php" Committing to: /home/lorna/.../lorna-repo/lorna-branch/ added db added hello.php added db/setup.sql Committed revision 2. $ bzr log ------------------------------------------------------------ revno: 2 committer: Lorna Mitchell <lorna@lornajane.net> branch nick: lorna-branch timestamp: Sun 2010-04-25 14:46:44 +0100 message: initialising database files and hello.php ------------------------------------------------------------ revno: 1 svn revno: 578 (on /lorna-test) committer: lorna timestamp: Sun 2010-04-25 12:02:32 +0000 message: New project for some source control examples
- 79. bzr-svn: Sending Changes to SVN $ bzr push ../lorna-trunk/ All changes applied successfully. Pushed up to revision 2. $ cd ../../subversion $ svn log --------------------------------------------------------------------- r579 | lorna | 2010-04-25 14:46:23 +0100 (Sun, 25 Apr 2010) | 1 line initialising database files and hello.php --------------------------------------------------------------------- r578 | lorna | 2010-04-25 14:02:32 +0100 (Sun, 25 Apr 2010) | 3 lines New project for some source control examples ---------------------------------------------------------------------
- 80. Changing State of the Landscape Talk proposed October 2009
- 82. Immature tools the deal-breaker
- 84. Tools now usable, and improving
- 85. Web Accessible All these tools are web browseable
- 86. Either natively or easily
- 87. Trac Trac now has integration for all these mentioned
- 88. Can hook in to update track from commits
- 89. Trac provides code browsing and understands source control
- 91. Tortoise TortoiseSVN - widely used windows gui http://tortoisesvn.tigris.org/ TortoiseBzr https://launchpad.net/tortoisebzr TortoiseGit http://code.google.com/p/tortoisegit/ TortoiseHg http://tortoisehg.bitbucket.org/
- 92. Code Hosting and Collaboration Provide repository space
- 93. Repo browsing, linked projects
- 94. Forums and mailing lists
- 95. Wiki (or similar: launchpad has blueprints)
- 98. Code Hosting Providers GitHub http://github.com/ git Bitbucket http://bitbucket.org/ hg Google Code http://code.google.com/ svn, hg Launchpad https://launchpad.net/ bzr SourceForge http://sourceforge.net/ svn, bzr, hg, git (and cvs)
- 99. Making Choices
- 100. Distributed Development Multiple repositories
- 101. Distribution is foreign to corporations
- 102. Processes are as important as tools
- 103. Learning curve
- 104. My Development Process Based on Subversion
- 105. Needs process on top of tools to use the best bits in a distributed setup
- 106. Single repo
- 107. All branches are available and shared
- 108. Everything is visible and backed up
- 109. Permissions SVN has very granular access control
- 110. Can use any of apache's mechanisms
- 111. Can path-restrict read access
- 112. Access control for DVCS mostly use hooks
- 113. What about access to cloned/forked repositories?
- 114. Cost of Transition Steeper learning curve
- 115. Implementation costs tool migration
- 116. process changes
- 118. user training (ongoing!) Hype and dismissive attitudes are unhelpful
- 119. A Read-only SVN Copy Common workaround
- 121. Holds latest changes on a nominated git repo
- 122. Tools can hook in
- 123. Users can svn:external to it
- 124. In My World Subversion has its place mature
- 125. great documentation and ecosystem
- 126. simple! What about managers, junior devs, designers, contractors?
- 127. One Recommendation
- 128. One Recommendation
- 129. One Recommendation
- 130. One Recommendation
- 131. One Recommendation
- 132. Team and Project Global team of expert geeks - use DCVS (any one)
- 133. Colocated team of mixed ability - use SVN
- 134. Everything else is a sliding scale!
- 135. Consider Your people
- 136. Your admins
- 137. The documentation, support and community of your chosen solution
- 138. Choice
Editor's Notes
- #3: Ibuildings is recruiting!
- #6: its about what works for you: your process your team your environment
- #8: subversion has been around longer, since 2000 the red bean book is free in digital format, or you can buy an actual book &quot;Apache Subversion&quot; as of February 2010
- #10: http://versioncontrolblog.com/comparison/Bazaar/Git/Mercurial/Subversion/index.html (source of the &quot;terse&quot; quote) uses commands unlike other source control systems'
- #11: I had good experiences with their IRC channel
- #12: used by people I want to work for
- #13: Look out for SVN tags, they're just a copy
- #24: CVS: each file had incrementing number git: which can be abbreviated (tag to make this more readable/useful) hg: 40 chars of hex which can be abbreviated
- #42: NB Versions not equivalent!
- #44: also beanstalk, unfuddle corporations hosting their distributed systems here that can get very expensive very fast
- #46: With multiple repositories, the chances of losing data are much smaller. Can work offline Distribution scares businesses, since they like to control where their code goes Processes need to support use of more complicated tools Higher requirements for recruits or more training and support needed for teams
- #58: (and if you're still interested in git - stay for Travis' talk!)