Ad
More Related Content
What's hot (20)
Viewers also liked (20)
Ad
Similar to Source Code Management systems (20)
Ad
More from xSawyer (14)
Recently uploaded (20)
Source Code Management systems
- 1. SCMs – What, Why and How? Sawyer X
- 2. Sysadmin / Perl Ninja
- 3. User of Subversion, Git
- 4. Your host for this evening
- 5. Oh, and...
- 6. SCMs = Source Code Management systems
- 7. Why? The more work you do,
- 8. the more work you can lose
- 9. The more iterations you make,
- 10. the harder it is to keep track, and retrace
- 11. Undo and Redo can only get you so far
- 12. Regular Work Cycle Work, work, work Good Bad Try something Shit! Retrace
- 13. How Do We Retrace? Keep backups in folders ( v1 , v2 , v2-stable , … )
- 14. Tarballs ( v1.tar.gz , v2.tar.gz , v2-final.tar.gz , … )
- 15. Comment out large code chunks
- 16. Write down notes ( README , help.txt , in code?)
- 17. Zip it all up and put it on Kazaa!
- 18. More... ?
- 19. What are SCMs? Source Code Management systems – we know!
- 21. Helps you store all your code
- 22. And every change you've ever done
- 23. Has a few more nifty options
- 24. Also called VCS (Version Control System)
- 25. What the … ? Commit We use an SCM program to work with the repository Work Repository
- 26. Regular Work Cycle - revisited Work, work, work Good Bad Try something Revert from last commit Commit
- 27. Comments Some people commit while working on new features
- 28. You can view the differences between the last commit you made with what you have now
- 29. You don't need to care about how the data is saved
- 30. … but if it helps, DB servers aren't involved :)
- 31. More SCM Features Atomic
- 32. Merging
- 33. Tags
- 34. Branches
- 35. Event Hooks
- 36. Blame
- 37. Bisect
- 38. ...
- 39. Centralized SCMs A master repository
- 40. It keeps the entire changeset
- 41. A commit pushes changes to the repository.
- 42. Examples: CVS, Subversion, Perforce
- 43. Decentralized/Distributed SCMs Each user/client is a repo
- 44. A commit is done to the local repo
- 45. You can have multiple remotes to push to
- 46. (… or a central one)
- 47. Can work and commit offline.
- 48. Examples: Git, Bazaar, Mercurial
- 51. Centralized
- 52. Distributed
- 53. New repo – Subversion style sawyer@potato:/repos$ svnadmin create project ferret@onion:~$ svn checkout svn+ssh://ferret@potato/repos/project Checked out revision 0. ferret@onion:~$ cd project ferret@onion:~/project$ echo "hello" > file ferret@onion:~/project$ svn add file A file ferret@onion:~/project$ svn commit -m "adding a new file" Adding file Transmitting file data . Committed revision 1.
- 54. New repo – Git style sawyer@potato:~/code/project$ git init Initialized empty Git repository in /home/sawyer/code/project/.git/ sawyer@potato:~/code/project$ echo "hello" > file sawyer@potato:~/code/project$ git add file sawyer@potato:~/code/project$ git commit -m "adding a new file" [master (root-commit) 961b958] adding a new file 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 file
- 55. Cooperation – Subversion style sawyer@potato:~$ svn checkout svn://svn.domain.com/project/trunk project sawyer@potato:~$ cd project … # work work work sawyer@potato:~/project$ svn commit -m "improved output" … # output trimmed sawyer@potato:~/project$ svn commit -m "fixed bug #4" … # output trimmed
- 56. Cooperation – Git style sawyer@potato:~$ git clone git://git.domain.com/project sawyer@potato:~$ cd project … # work work work sawyer@potato:~/project$ git commit -a -m "improved output" … # output trimmed sawyer@potato:~/project$ git commit certain_file -m "fixed bug #4" … # output trimmed sawyer@potato:~/project$ git push … # output trimmed
- 57. Diff the Data, Checking the log [email_address] :~/project$ git diff sawyer@potato:~/project$ git diff --cached sawyer@potato:~/project$ git diff f633d5 sawyer@potato:~/project$ git log sawyer@potato:~/project$ git log -p
- 58. Reverting Changes [email_address] :~/project$ git revert -m "shouldn't have added that feature" sawyer@potato:~/project$ git reset –hard 7f8a8bb6
- 59. Branching FTW [email_address] :~/project$ git checkout -b new_branch sawyer@potato:~/project$ git commit -m "stuff..." sawyer@potato:~/project$ git checkout master sawyer@potato:~/project$ git checkout new_branch sawyer@potato:~/project$ git branch
- 60. Branching – a Graph
- 61. Stages of Accepting SCMs Denial - „I don't need an SCM”
- 62. Anger - „Quit telling me I need it!”
- 63. Bargaining - „Maybe if I keep better track of my .tar.gz files...”
- 64. Depression - „I'll never learn to use SCMs” :(
- 65. Acceptance - „This is so cool, I'm gonna use this for everything! I wonder if I can legally marry my SCM...”
- 66. Resources! Git: ProGit.org – Free book!
- 67. Github.com – Free repository hosting
- 68. Subversion:
- 69. Svnbook.Red-Bean.com – Free book!
- 70. Code.Google.com – Free repository hosting