[darcs-devel] [patch1431] capture diffAlgorithm in splitters inste... (and 1 more)

Guillaume Hoffmann bugs at darcs.net
Sun Jan 17 09:43:24 UTC 2016


Guillaume Hoffmann <guillaumh at gmail.com> added the comment:

I reviewed both patch together because showing the diff of the
conflicting patch only (without resolution patch) shows incorrect stuff.
So I did:

    darcs diff --from-hash 40548bf8aa  --to-hash fe2f003cce

* capture diffAlgorithm in splitters instead of passing it to
SelectChanges unconditionally

The changes of the patch is to removes the diffAlgorithm field
from the SelectChagnes and put this option instead of splitters. The
result is that UI commands that do not need to edit hunks (for instance,
pull, push) no longer have to specify a diff algorithm to call interactive
selection. This is a nice change. And tests pass.

Accepted.

----------
status: needs-review -> accepted

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


More information about the darcs-devel mailing list