WorkHabit Blogs
WORKHABIT LABSMerging onto the Freeway in different revision control systems..
Inspired by an experience merging a rather large branch into trunk on a client project (which went surprisingly well, actually), as well as the now-famous Languages: Shooting Yourself in the Foot we present to you a rather comical view of the developer's best and worst friend: The revision control system.
And thusly I give you:
Merging onto the Freeway in different Revision Control Systems
SVN
You merge your car onto the freeway, only to find that the freeway didn't exist at the revision you tried to merge. Once you figure out that, you try to merge and get a conflict. Three copies of your car are left on the freeway to get hit by oncoming traffic and the one you're sitting in won't start.
GIT
You merge onto the freeway at extremely high rates of speed. After you complete the merge, your car's engine resolves as fast-forward, blows out of the front of the car and you run it over.
Perforce
You successfully complete the merge, but this triggers a chain reaction across all cars on the freeway in all lanes. A five hundred car pileup ensues.
CVS
You find that you can't merge your car onto the freeway because the lane you're trying to merge into is a read-only tag. Your merge fails and you end up in a ditch on the side of the road.
Visual SourceSafe
You complete the merge safely, only to find that you're pinned between the car in front of you and about fifteen behind. Traffic slows to a halt.
Mercurial
You create a copy of your car, which you attempt to merge into oncoming traffic. The last thing you see as a semi hits you is its license plate.
RCS
You merge your Honda into the big-rig next to you, which looks incredibly startled as it turns into a Toyota minivan.
Bazaar
You take your car apart piece by piece and assemble it next to the nearest car on the freeway. When you're done, you take off only to find that you left the child seat sitting in the onramp.
Monotone
Similar to Bazaar, except you merge most of your car onto the freeway. You realize partway through that your exhaust manifold is no longer compatible with the freeway, so you throw the car into reverse and hit the car behind you.
Any others I'm missing? Drop in a comment with it!


Post new comment