Recommended
More Related Content
Viewers also liked
Similar to Source Control Abominations
Similar to Source Control Abominations (20)
More from Donald Belcham
More from Donald Belcham (14)
Recently uploaded
Recently uploaded (20)
Source Control Abominations
- 1. Source Control Abominations The Bad, The Ugly, The Inconceivable Donald Belcham @dbelcham
- 3. VSS Yes, we’re going there.
- 4. Please map Z: to servershare1 to begin development work
- 5. Open Z:OurApp.sln in Visual Studio
- 6. Ctrl-Alt-B
- 7. “The file OurApp.exe is in use by another process”
- 8. “Some files changed outside of the IDE. Would you like to refresh them?”
- 9. It’s okay, I’ll just work offline
- 10. 1. Copy Z: contents to C:
- 11. 2. flip the file level Read-Only flag to be off
- 12. 4. Make all kinds of changes and save those files
- 13. 5. Go back to the office at some point down the road
- 14. 6. Copy your C: files overtop of those files on Z:
- 15. 7. Win
- 16. How can you ever trust the source code?
- 18. Source code needs to be written in isolation
- 19. There are many different ways to get isolation
- 20. CVS Quantum leaps are made over VSS and we will be saved!
- 21. Whaddya mean we don’t have exclusive file locks by default?
- 22. This isn’t how branching worked in VSS!
- 23. All development is done on trunk
- 24. All releases are made from trunk
- 25. Get me the source for a past release please
- 26. Production hot fix time rolls around…
- 27. Pffft. The businesses doesn’t want those
- 28. We do services packs! (which really are the next full release)
- 29. Don’t ship that feature!
- 30. Understand the capabilities of your tools
- 31. Use them to do better at your job
- 32. SVN Things will be different this time…I promise
- 33. Branches are cool. Let’s use them.
- 34. You get a Branch! You get a Branch! Everyone gets a Branch!
- 35. Don’t you *dare* kill my branch
- 36. Day 1… This release is going to go so much better than the last one
- 37. Day 20… I’m making pretty good progress
- 38. Day 40… I wonder how other people are making out with their tasks?
- 39. Day 90… Finished! Just in time to merge my stuff to trunk before tomorrow’s release.
- 40. Day 91… Dammit. My last commit just got overwritten by that other devs merge
- 41. Day 100… Okay. That was the last merge.
- 42. Isolation doesn’t mean ignoring integration
- 43. Merges really aren’t that hard
- 44. If you use the tool properly
- 45. TFS Don’t worry, it’ll take care of everything
- 46. We’re using feature branches
- 48. We isolate our releases
- 49. Release 1.5 is out the door! (insert party music here)
- 50. Let’s get going on v1.6!
- 51. 1. Select folder in Windows Explorer
- 52. 2. Ctrl-C
- 53. 3. Ctrl-V
- 54. 4. Rename new folder to v1.6
- 55. 5. Setup new working directory and start coding v1.6 FTW!
- 56. v1.5 needs a hot fix
- 57. 1. Make changes in v1.5 folder
- 58. 2. Test, test, test.
- 59. 3. Create a release package (victory over the bugs!)
- 60. 4. Manually port the fix changes to the v1.6 folder
- 61. 5. Reconcile bug fix changes with v1.6 code changes
- 62. 6. Test, test, test
- 63. 7. Wait until the next release to find out if you ported successfully!
- 64. Every release we forget about the past
- 65. You can’t trace the reason for changes in history
- 66. Manual processes are prone to error
- 67. git The saviour has arrived!
- 68. Isolation gets taken one step further
- 69. Instead of forcing changes we can take those we want
- 70. Tools are built to help us with our workflow
- 71. But every time github goes down twitter lights up because “we can’t work”
- 73. The tool is capable of so much more
- 74. But we don’t learn it because its too hard
- 75. To wrap it all up… We can do better
- 76. Learn your tools capabilities
- 77. Practice with your tools capabilities
- 78. Learn from other systems
- 79. Full control over VCS is paramount to protect the businesses assets
- 80. Make your VCS skills as important as your coding skills
- 81. Thank you…
Editor's Notes
- This example is of the first place I worked out of college. Team of 4-6 developers.
- This example is of the first place I worked out of college. Team of 4-6 developers.
- Pretty normal (for many different and valid reasons) to do as part of a dev team
- Ummmm….okay
- Better yet, some other person has an exclusive check-out on a file under their user name…and you can edit that file….but you can’t check it in.
- At some point the friction becomes so high you decide to work offline
- Remember, this is saving to where copied to on C:
- This is the red-neck merge
- You’re packing the big hammer with the copy-pasta. Everybody else’s changes are knocked out by what you did.
- One guy took to hard rebooting the SQL server if his debugging results didn’t match what he expected
- Many people think of source control as a storage tool….or a backup tool. It’s a tool that enables working in isolation for many reasons. One is to be much more productive.
- The paradigm shift was big and many people didn’t get it. They wanted what they had before.
- Piss-poor terminology overloading didn’t help matters either.
- Aka: We don’t have a clue how we can do those
- So we come up with inventive word games
- Developers hold changes locally (copy-pasta to a unmanaged folder) as a means to keeping them out of releases.
- You’re hired to solve business problems. Hotfixes, new features, etc are all business problems that you need to solve and VCS is one of the tools that help enable that solution
- It’s starting to feel like Stockholm syndrome isn’t it?
- Branches become developer silos
- Everyone starts to merge big changes at the same time
- Now everyone thinks that merges are hard
- Short lived and merges are easier
- There are no surprises from each other’s code
- Now imagine a world where you had a v1.5 hotfix, and v1.6 and v1.7 releases.
- The folder copy paste in source control drops the history
- we decouple from the central server model
- gitflow
- Not just images….dlls…exes….the /packages folder
- Also learn it’s weaknesses so that you can work with or around them as needed
- Even if you don’t use git look at the patterns used in gitflow to see if they may help with the way you work