Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.

Source Control Extravaganza!

676 views

Published on

A talk given by Matt for IndyALT.NET in October 2009.

Published in: Technology, Business
  • Be the first to comment

  • Be the first to like this

Source Control Extravaganza!

  1. 1. Source Control
  2. 2. a history
  3. 3. a “history”
  4. 4. The Programmer’s Dilemma a natural history of four source control systems
  5. 5. 1.
  6. 6. SCCS
  7. 7. RCS
  8. 8. $ ci sample.txt sample.txt,v <-- sample.txt enter description, terminated with single '.' or end of file: NOTE: This is NOT the log message! >> Created a sample checkin. >> . initial revision: 1.1 done $ ls sample.txt,v $ co sample.txt sample.txt,v --> sample.txt revision 1.1 done $ ls sample.txt sample.txt,v
  9. 9. RCS
  10. 10. CVS
  11. 11. edit merge commit
  12. 12. branch/merge
  13. 13. tag
  14. 14. CVS
  15. 15. subversion
  16. 16. atomic!
  17. 17. atomic! http://www.flickr.com/photos/sakucae/3686680582/
  18. 18. branch = copy
  19. 19. 2.
  20. 20. ClearCase
  21. 21. base
  22. 22. UCM
  23. 23. checkout
  24. 24. snapshot views
  25. 25. dynamic views
  26. 26. merge arrows
  27. 27. 3.
  28. 28. TFS
  29. 29. 4.
  30. 30. git
  31. 31. commit e83c5163316f89bfbde7d9ab23ca2e25604af290 Author: Linus Torvalds <torvalds@ppc970.osdl.org> Date: Thu Apr 7 15:13:13 2005 -0700 Initial revision of "git", the information manager from hell
  32. 32. distributed
  33. 33. • arch • darcs • mercurial • bazaar
  34. 34. practices
  35. 35. mainline
  36. 36. branch per feature
  37. 37. promotion
  38. 38. double merge
  39. 39. git example
  40. 40. git add sample.txt
  41. 41. git commit
  42. 42. (edit sample.txt) git add -u git commit
  43. 43. git mv sample.txt renamed.txt git commit
  44. 44. git checkout -b other git add a git commit
  45. 45. git merge master
  46. 46. git checkout master git merge
  47. 47. • Software Configuration Management Patterns, by Steve Berczuk with Brad Appleton (http://scmpatterns.com/) • git • Pro Git, by Scott Chacon (http:// progit.org) • Git Parable (http://lmgtfy.com/?q=git +parable) • http://git-scm.com/
  48. 48. Thank you! Matt Burke <maburke@sep.com> http://mattonrails.wordpress.com/ http://www.slideshare.net/spraints/overview-of-source-control-systemskey

×