[darcs-users] Re: What's better, Darcs or Mercurial?

[Matt Mackall]

On Sat, Feb 25, 2006 at 11:46:23AM -0700, Will wrote:
> Radoslaw Szkodzinski <astralstorm at gorzow.mm.pl> writes:
> 
> > Ruini Xue wrote:
> >> 
> >> I found distributed VCS is what I want, however there are so many
> >> of them. After some basic reading, I want to choose between darcs
> >> and mercurial.  But I can no decide which is better, or what's
> >> their main differences and how about their future development?
> >> 
> 
> I prefer to use darcs for code because it automatically merges any
> non-conflicting changes when pulling patches from different
> repositories.  This makes it very easy and natural to create a branch
> for changes and then integrate them into other branches with minimal
> difficulty.
> 
> Mercurial does not do automatic merging, so non-conflicting changes to
> the same file require manual review.

Mercurial does no merging internally. But with the right tools
installed (merge and kdiff3, for example), the hgmerge script will
automatically merge non-conflicting changes.

-- 
Mathematics is the supreme nostalgia of our time.