The document discusses various version control systems, including Subversion, Git, Bazaar, and Mercurial, highlighting their features, documentation, and user bases. It compares centralized and distributed source control, noting the advantages of distributed systems while emphasizing the importance of processes in development. The content also covers bridging tools for integrating these systems and concludes with recommendations based on team composition and expertise.

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

5. Active with PHPWomen.org

6. Organiser at PHPNW

7. Personal blog: http://lornajane.net

8. Twitter: @lornajane

9. Source Control Keeping-place for code

10. Centralised or distributed

11. Project archive

12. Collaboration tool

13. Integration point for development

14. for business processes

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

23. Features Atomic commits

24. File renames

25. Symbolic links

26. Pre/Post event hooks

27. Merge tracking

28. Tags

29. EOL conversions

30. Protocols Everything supports SSH and HTTP(S)

31. Distributed systems support email

32. Bazaar supports FTP

33. Git supports rsync

34. Centralised vs Distributed Source Control

35. Centralised Source Control

36. Centralised Source Control Traditional model

37. Subversion uses this

38. Other products can do it

39. Distributed Source Control

40. Distributed Source Control

41. Distributed Source Control Git, Bazaar and Mercurial are distributed

42. Many repositories

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