[darcs-devel] Any answers for IsiSetup's concerns?

David Roundy daveroundy at gmail.com
Thu Dec 20 15:15:48 UTC 2007

I just mean that darcs 2 will address the conflicts issue, which so
far as I know, is the only problem with darcs' merge capabilities.  We
don't discuss silly merge topologies (octopus, squid, horse) simply
because with darcs (apart from the conflicts issue) the problems those
features address don't exist.  At least, that's what I'd guess.  I
don't actually spend much time reading the documentation of other
version control systems.


On Dec 20, 2007 9:58 AM, Ferenc Wagner <wferi at niif.hu> wrote:
> David Roundy <droundy at darcs.net> writes:
> > On Wed, Dec 12, 2007 at 07:09:55PM +0100, Ferenc Wagner wrote:
 >> Now what's this bussiness about "merge capabilities"?  Do you know
> >> what's missing, how's git or anything else better?
> >
> > I'm not sure what they mean by that, but I'd guess that it's what darcs 2
> > addresses.
> What do you mean?  I always wondered why others talk about star,
> octopus, zig-zag, etc. merges, while the Darcs docs doesn't mention
> anything like that.  I'm mostly ignorant of this topic, and don't
> expect you to go into a lengthy discussion, but some pointers
> (especially with Darcs 2 references) would be welcome.

More information about the darcs-devel mailing list