Charles Manning wrote: > We have been discussing moving from cvs to git in early 2010. At my work we switched over from cvs to mercurial a couple of months ago. The three leading DVCS contenders (hg, git and bzr) all do generally the same job, with a few differences in the philosophical details. Once you've climbed one learning curve you're pretty much there for all of them, though git's is reputed to be a bit steeper. (Personally, I found no real problems with git, making fairly heavy use of it on a personal repo for several months, but I can see there is a difference.) A concern for us was the level of Windows client support; we found that git was a bit lacking in this regard. Git seems to expose more low-level power features, which you may not need; it also makes it easier to get really confused and/or shoot yourself in the foot! It's often straightforward to import your entire CVS history to a DVCS. In fact I have a daily cron job which pull any new changes from the yaffs2 CVS into my internal staging repo and emails me about them. You'll be happy to hear that it runs without a hitch, though other projects have had trouble with the conversion. You might find our public repo for the eCos port of YAFFS interesting, if nothing else by way of showing you what the YAFFS codebase looks like in a mercurial repo (albeit viewed through the lens of the different eCos directory layout). The graph view shows how my porting and merging work relates: http://hg-pub.ecoscentric.com/yaffs-ecoscentric/graph/ Ross -- eCosCentric Ltd, Barnwell House, Barnwell Drive, Cambridge CB5 8UU, UK Registered in England no. 4422071. www.ecoscentric.com