Tracking change and innovation in the enterprise software development community
IBM WebSphere
Virtualize apps
to lower costs,
Increase agility
Learn more!
Create REST
-enabled Web Apps
with Project Zero
from IBM.
QCon San Francisco
Nov 19-21:
+ 80 sessions & tracks
Register now
and Save $400!
Terracotta:
Scale your
Apps w/ease
Offload the DB:
Learn More!
Posted by Niclas Nilsson on May 09, 2008 06:37 PM
Article: Distributed Version Control Systems
Since Linus Torvalds presentation at Google about git in May 2007, the adoption and interest for Distributed Version Control Systems has been constantly rising. In this article, Sebastien Auvray introduces the concept of Distributed Version Control, see when to use it, why it may be better than what you’re currently using, and have a look at three actors in the area: git, Mercurial and Bazaar.
Sebastien start out by comparing Distributed Version Control Systems with Centralized VMS:es:
Or a more precise question: Why Central VCS (and notably Subversion) are not satisfying? Several things are blamed on Subversion:
* Major reason is that branching is easy but merging is a pain (but one doesn't go without the other). And it's likely that any consequent project you'll work on will need easy gymnastic with splits, dev, test branches. Subversion has no History-aware merge capability, forcing its users to manually track exactly which revisions have been merged between branches making it error-prone.
* 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.
* The trunk/tags/branches convention can be considered misleading.
* Offline commits are not possible.
* .svn files pollute your local directories.
* svn:external can be harmful to handle.
* Performance
After that, Sebastien moves on to describe how DVCS works, which the open source options are, before he comes to the an excellent comparison between git, Mercurial and Bazaar. The comparison includes things line features, model, web access, integration, performance, hosting options and many other things.
If you’re having trouble deciding which DVCS to pick, this is the article for you.
IBM Agile Development eKit: Free Articles, Expert Q&A, Educational Resources
SOA Development Survival Guide
RESTful todo list sample tutorial with Groovy & Project Zero
Scaling Agile on large teams & Being Agile every day Tracks @ QCon SF Nov 19-21
Create a photo album application with Project Zero and REST design principles
Git integrates well with Readmine (http://www.redmine.org/), a Rails-based Issue Tracker. Just had to add this one ;)
I thoroughly enjoyed this. And I learned a lot from this as well. Somehow our switch from CVS to Subversion makes less sense now after reading this.
The problem with this analysis, and those like it, is that they assume SVN as the state of the art. SVN is the state of the "free" art; but is missing a lot of features that perforce offers. Now Perforce is pretty costly, but when broadly comparing "centralized vs. decentralized" it's probably not quite on target to use the "best free" rather than the "best." Many of the issues cited (and thereby implied to be issues with centralized solutions) For example, perforce does not pollute your directories with control files. Perforce does a fantastic job of maintaining merges between branches and keeping merge history. Indeed, most of the arguments put forward against "central" tend to be limitations in the SVN implementation of centralized SCM rather than limitations in the state of the art.
Dude, this was a very, very nice article. Thanks for the rollup.
Hi Chris, I agree with you that Perforce got some good points that SVN do not support. But as you said 1) you need to pay for it 2) you really need to take a big care of your production scalability (as any central server...) else it's becoming a big bottleneck and you're blocked at each branch creation... Some Editors like Idea add some intelligence to that like adding the Offline mode.
DVCS's are young, but very capable. They are rather tools not systems to manage the code. Users need to come up with their own workflow and thats what a lot of them do not get. It can be frustrating when someone tries out one of them and it seems complicated after CVS/SVN. The benefits are not so obvious (what are the benefits for a developer who has never ever did any branching and merging in CVS/SVN?). > Mercurial SLOC (without Test src) Mercurial's core is python + c only (there are 4 c files). What I don't like about Git: - is that it is a mess. c+perl+bash - my environment is polluted by it really hardly (at least in msys git, there are huge amount of aliases) - native windows port is really far from being production ready. (I can not even use it from behind firewall.) What I don't like about Mercurial: - tree handling is not really good. It's not an easy call to implement it right, but it is important. - editing of the history is considered harmful and not really supported (can be done though through extensions, but not as nice as in git) What I like about Mercurial: - hgbook is awesome - easy to extend (the included extensions are good starting point) - clean python - very flexible, you can build nice workflows around it - mq is evil but very handy once you understand what and how is it doing
Great article, nice comparison & research. I've been very interested in BitKeeper and git since reading about the controversy with Linux. Very cool idea, and if anyone's interested there is some very good doc out there explaining how BitKeeper works. And I find it amazing that when Larry McEvoy pulled the plug on the Linux licenses, Linus (or someone) shook git out of their sleeve in a short time. Impressive. Now that said, Torvalds has an incredible knack for saying incredibly insulting comments. SVN is pointless? When 59% of git users also use SVN or CVS? and anyone who uses CVS is stupid - uh - this coming from someone who didn't use *any* version control until forced to do so because it was impacting the work on Linux? Now that was nuts. Now, SCM is a given, CVS is probably one of the grandaddy, we stand on the shoulders of giants. And SVN's aim was to fix issues with CVS, nothing more, isn't git pretty much a clone of BitKeeper, like Linux a clone of Unix? Hopefully for Linus, the successors to Linux will have a more admirable view of their forebearers.
Thanks for the informing article. Another option for a DVCS maybe SVK. I haven't tried it myself, so feedback or a review of SVK would be appreciated.
Copied from wikipedia:
"SVK (also written svk) is a decentralized version control system written in Perl, with a hierarchical distributed design comparable to centralized deployment of BitKeeper and GNU arch.
SVK uses the Subversion filesystem but provides additional features:
* Offline operations like checkin, log, merge.
* Distributed branches.
* Lightweight checkout copy management (no .svn directories).
* Advanced merge algorithms, like star-merge and cherry picking.
* Changeset signing and verification.
* Can mirror and operate on Subversion, Perforce and CVS repositories."
I do think it addresses some of the problems of subversion, but seeing I haven't used it I don't know what new problems it creates.
Regards,
Your overview lists Bazaar as not having support for Rebase and queues. However, there is a rebase plugin available for Bazaar ( http://bazaar-vcs.org/Rebase) and a queues one (http://launchpad.net/bzr-loom).
Hi Jelmer,
You're right, I'll update this asap.
I'll also take into consideration some interesting remarks from reddit.
Thanks.
Nice overview, thanks. One thing, though -- the "major reason" you list for moving from Subversion is the difficulty of merging, but history-aware merge is the major improvement being delivered in Subversion 1.5. That's mentioned in the pages you link to at the end of your article, but given the importance attached to the feature, I thought it might be worth calling out.
git gc by default uses a conservative window size to save memory. For relatively large import from foreign repositories you should run: git repack -a -f -d --window=100 --depth=100 A couple of times until the repository doesn't get any smaller.
Being a novice in the matter, I'd be very interested in having some feedback on how SVK compare to the mentioned DVCS. I had identified it as a potential solution to solve my SVN problems, mainly off-line commits and .svn file. I'm very happy for the new perspectives the articles gave me. Thanks for the hard work!
This otherwise rather interesting article is for me and for more than 10% of readers fatally undermined by the choice to use generic icons differing only in red/green colour choice in the first comparison table. Simple check/dash/x symbology, or even a tooltip, would dramatically increase its usefulness.
[Article updated on 20080512 according to the comments here and from Ian Clatworthy and reedit]:
git repack -a -f -d --window=100 --depth=100 until size becomes constant) (Thanks to the comment by dhamma vicaya).
Hello. A nice article, but I am a bit disappointed. First of all there is no mention of http://www.monotone.ca/ which is a well recognised DVCS now-a-days. It also fails to mention that git traditionally is fastest because on linux good old Linus Torvalds is using all the low level filesystem tricks you can possibly think off.
@Perforce : That's why Open Source (and free beer) is relevant : you get considered.
Developer's choices are not based on which is best, but what is my community using, as the author noticed : it seems as if some choices have emerged based on the language used by the communities: Java / Sun related developments seem to be interested more in Mercurial while C / Linux / Ruby / Rails related projects are attracted by git.
But overall, the point is that your SCM tool should support your workflow and processes. It maybe be easier to change the tool than it is to change the processes.
My measurements have 'bzr clone master feature-1' coming in around 22 secs. A patch is available to reduce this to 16 secs. See this email for further details.
If you want to save further time and space when cloning in Bazaar, use the --hardlink option. It cuts the time to 11.2 secs (vs 11.1 secs for git on my computer) and reduces space usage across the working trees, which is where most of the disk space get consumed in tools as efficient at historical storage as these.
Seems like branches are supported in hg: http://hgbook.red-bean.com/hgbookch8.html
Thin client paradigm characterized by web applications is a kludge that needs to be repudiated. Old compromises are no longer needed and it's time to move the presentation tier to where it belongs.
In this presentation filmed during QCon 2007, Jeff Sutherland, the creator of Scrum, talks about his visit at Google to do an analysis of Google's first implementation of Scrum.
In this article, Bryon Jacob and Chris Berry introduce AtomServer, their implementation of a full-fledged Atom Store based on Apache Abdera, which is now available as open source.
It is easy to think that virtualization applies only to servers. In reality the recent resurgence of the concept is also being applied to networking, storage, and application infrastructure.
In this article, Stefan Tilkov explains some of the most common anti-patterns found in applications that claim to follow a "RESTful" design and suggests ways to avoid them.
In this article, Adrien Louis and Marc Dutoo discuss the differences and relative merits of using orchestration vs. routing in a typical ESB setup, and discuss various implementation options.
Wayne Lund discusses batch processing, Spring Batch objectives and features, scenarios for usage, Spring Batch architecture, scaling, example code, failures and retrying, and the future roadmap.
Developer Jay Fields draws on his experiences as a ThoughtWorks consultant to describe effective user story estimation techniques.
19 comments
Reply