3 ms·
Are we talking about the Darcs version < 2 merge algorithm or the merge algorithm in current darcs?
by carterschonwald 7y ago
Are we talking about the Darcs version < 2 merge algorithm or the merge algorithm in current darcs?
- pmeunier 7y agoThe current darcs. Conflict fights are still exponential, and happen sometimes. I'm a really happy darcs user, but I was talking about complexity theory here, which considers worst cases. For the sake of completeness, I don't know the full story for the complexity of Darcs "in most cases", but I believe it to be linear in the size of history in the normal case (as it needs to try and commute all the patches with your new patch).
- gnufx 7y ago"Current" might mean the latest release or the current darcs.net repo with v3 patches, which I can't claim to have followed.