Matt Mackall wrote: > > 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.
Matt: Thanks for inventing Mercurial. The deep difference between darcs and Mercurial is that darcs does full-history merging and mercurial doesn't. I am aware of recent work to add such functionality to Mercurial [1]. I hope that it gets support from the Mercurial community. An important consequence of darcs's use of complete history in merging is that darcs knows which parts of history are irrelevant and which are necessary, and so when you do cherry-picking it automatically includes all patches which are syntactically necessary for the picked cherry. This doesn't make darcs better than Mercurial -- at least not for all uses -- but it is a deep and important difference. Darcs and Mercurial are not functionally equivalent. Regards, Zooko [1] http://www.selenic.com/pipermail/mercurial/2006-January/006132.html _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
