Dscm barcelona

Notes de l'éditeur

2. Writing software for 11 years (Java, Ruby, Php) - (Sun, DB, Betfair?) Clearcase, CVS, SVN, Git In Valencia for 8 years Ask questions at any time - English or Spanish
3. Version control vital Only part of project success- No golden bullet Definition, Evolution, SVN vs Distributed (Git), Mercurial/Git/Bazaar -> A little advice. Aim - to give you the knowledge to make an informed choice given your projects’ context.
4. Disaster recovery Multiple simultaneous versions Traceability Collaboration - who, when (and WHY if you’re lucky!)
5. Three generations of SCM tools Drivers -> shortcomings of existing tools + improvements in technology (connectivity) I forget to unlock and you can’t write to the file
6. CVS used RCS as a building block. TeamWare used SCCS - first system with no notion of a central repo (EOL). CVS - simultaneous changes stored individually and poor file hierarchy management Subversion - multi-file atomic commits, better namespaces Visual SourceSafe (Microsoft) - read the web page, it puts the fear of God into me.
7. Linux was using BitKeeper. Was one of the first to allow a truly distributed model Bazaar - Ubuntu, MySQL Mercurial - Firefox, Opera, CodeIgniter, Google Git - Facebook, Twitter, jQuery, Rails
8. Everything is local, faster Backups are every contributor’s copy Flexibility - Tools don’t dictate your workflow
9. .svn files pollute your local directories. Offline commits are not possible. No way to push changes to another user (without submitting to the Central Server). Subversion fails to merge changes when files or directories are renamed. Major reason is that branching is easy but merging is a pain.
10. .svn files pollute your local directories. Offline commits are not possible. No way to push changes to another user (without submitting to the Central Server). Subversion fails to merge changes when files or directories are renamed. Major reason is that branching is easy but merging is a pain.
11. Social Coding LaunchPad - Pretty basic experience, 5 min wait for web to update, Loggerhead viewer Google Code supports Mercurial too but over http
13. quite a good user experience
14. Smoothest experience
15. LaunchPad - Pretty basic experience, 5 min wait for web to update, Loggerhead viewer
16. Clicking on “view branch content”
17. Links to compare web-sites for each tool. Look at the differences and then some practical examples.
19. Most specific at the bottom - Last one wins any conflict Tool level configuration - shell / IDE config later
20. Mercurial Remotes - default for pulls, named remotes are possible but config editing is by hand. Bazaar - automatic after the first push, are named remotes possible?
21. Mercurial - Only the hexnum is guaranteed unique -> Bazaar - Only the revision_id is guaranteed unique Advantages? Mercurial stores Changesets - what has changed / safer because it only ever appends data But fundamentally they all deal with patch files - groups of “diff”s - which are made up of “hunks”.
23. History is immutable Standard is to clone the repo in a new directory Simple, intuitive, more like SVN, therefore less mistakes Apply a persistent name to a branch lets you do something Git like
24. No clone of the repository in a new directory. A push does not oblige you to push all branches. Functionality is partially available in other systems with plugins, etc.
25. Bound branch is like subversion but checks you’re up to date with the central repository BEFORE making the local commit. Philosophy that the trunk should be ready to ship all the time
26. CVS and SVN - “time to branch” is low, but merging itself is almost always a painful process. Merging a second time from another branch is WORSE. Incentives for developers to merge regularly are exactly the wrong way around. Tools need to track what has already been merged.
27. Manage a stack of patches Can be put under version control Can be shared independently of the main repository
31. Git is installed with .sample example scripts in .git/hooks Example use cases Arguments passed to scripts
33. Murky only for OS X
34. Netbean has support as well
36. Jira searches for IDs in the repository (SVN plugin) BugTracker -> SCM Bugzilla - Bazaar / Mercurial / Git hooks update the bug IDs SCM -> BugTracker
38. Capistrano - deployment runs on the target server - gets the code from the SCM system