In Subversion (and CVS), the repository is first and foremost. In git and mercurial there is not really the concept of a repository in the same way; here changes are the central theme. +1 The hassle in CVS/SVN comes from the fact that these systems do not remember the parenthood of changes. In Git and … Read more
There’s a new git-remote-hg that provides native support: Bridge support in Git for Mercurial and Bazaar Just copy git-remote-hg to your $PATH, make it executable, and that’s it, no dependencies (other than Mercurial): git clone hg::https://www.mercurial-scm.org/repo/hg/ You should be able to push and pull from it as if it was a native Git repository. When … Read more
You can see dangling commits with git log -g. -g, –walk-reflogs Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. So you could do this to find a particular string in a commit message that is dangling: git log -g –grep=search_for_this Alternatively, if you want to … Read more
The claim of why merging is better in a DVCS than in Subversion was largely based on how branching and merge worked in Subversion a while ago. Subversion prior to 1.5.0 didn’t store any information about when branches were merged, thus when you wanted to merge you had to specify which range of revisions that … Read more
Fortunately for those of us who are still forced to use CVS, git provides pretty good tools to do exactly what you’re wanting to do. My suggestions (and what we do here at $work): Creating the Initial Clone Use git cvsimport to clone the CVS revision history into a git repository. I use the following … Read more
These articles may help: Git vs. Mercurial: Please Relax (Git is MacGyver and Mercurial is James Bond) The Differences Between Mercurial and Git Edit: Comparing Git and Mercurial to celebrities seems to be a trend. Here’s one more: Git is Wesley Snipes, Mercurial is Denzel Washington
I too have been looking for a case where, say, Subversion fails to merge a branch and Mercurial (and Git, Bazaar, …) does the right thing. The SVN Book describes how renamed files are merged incorrectly. This applies to Subversion 1.5, 1.6, 1.7, and 1.8! I have tried to recreate the situation below: cd /tmp … Read more
Disclaimer: I use Git, follow Git development on git mailing list, and even contribute a bit to Git (gitweb mainly). I know Mercurial from documentation and some from discussion on #revctrl IRC channel on FreeNode. Thanks to all people on on #mercurial IRC channel who provided help about Mercurial for this writeup Summary Here it … Read more
In Git land you are talking about three different types of partial clones: shallow clones: I want history from revision point X onward. Use git clone –depth <n> <url> for that, but please remember that shallow clones are somewhat limited in interacting with other repositories. You would be able to generate patches and send them … Read more
I have just introduced a DVCS (Git in this case) in a large banking company, where Perforce, SVN or ClearCase was the centralized VCS of choices: I already knew of the challenges (see my previous answer “Can we finally move to DVCS in Corporate Software? Is SVN still a ‘must have’ for development?“) I have … Read more