[darcs-devel] [patch1645] slightly relax the commute rules for adjacent hunks

Ben Franksen bugs at darcs.net
Fri Feb 16 00:41:17 UTC 2018


Ben Franksen <ben.franksen at online.de> added the comment:

I should mention that this can cause previous darcs versions to crash
when used with new repos where the relaxed rules have been used to pull
patches that previously would have caused conflicts but now no longer do so:

darcs: bug at src/Darcs/Patch/Depends.hs:373 compiled Feb 14 2018 22:47:21
Failed to commute common patches:
[...details omitted...]

This happened with two test repos with a common start patch and
different patches on top that currently conflict, but no longer conflict
with the relaxed rules. I successfully pulled from one repo to the other
using the relaxed rules, and then pulled with the current darcs in the
other direction.

This is unfortunate but unavoidable due to the way patches are
(currently, still) handled at the Repository level.

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch1645>
__________________________________


More information about the darcs-devel mailing list