[darcs-users] unique features + exponential time issue
monnier at iro.umontreal.ca
Wed Oct 24 17:04:57 UTC 2007
> One good consequence of the patch theory is that it allows darcs to
> apply patches rigorously: other systems use "fuzzy" patching, searching
> through a file for what seems to be the best place to apply each change.
> Darcs knows exactly where the changes should go by looking at the patch
> histories of the source and target repositories. This removes a potential
> cause of corruption.
I don't think that's right.
All the other systems I tried use `diff3' when merging branches and this
doesn't make any more guesses or searches than darcs. OTOH darcs's approach
can sometimes better resolve apparent conflicts. Also the fact that it
doesn't rely on a *sequence* of patches makes it particularly good at
cherry-picking and keeping track of merge history.
More information about the darcs-users