[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [patch2358] optimize conflict resolution in tentativelyMergePatches_
From:       Ganesh Sittampalam <bugs () darcs ! net>
Date:       2024-02-18 16:51:28
Message-ID: 1708275088.87.XYO7KMKLHGDUUKXX.patch2358 () darcs ! net
[Download RAW message or body]


Ganesh Sittampalam <ganesh@earth.li> added the comment:

Looks fine. I haven't thought in detail about whether conflict
resolution is symmetric like this but it seems reasonable.

> +          null $ conflictedPaths $ patchsetConflictResolutions $

Using "conflictedPaths" as the indicator of "are there any conflicts"
seems standard in other places in the code, but it does feel a bit
ugly. It doesn't seem intrinsic that a conflict has to be associated
with some path, though it's no doubt true right now, at least if
we ignore the already-broken setpref patches.

----------
status: needs-review -> accepted-pending-tests

__________________________________
Darcs bug tracker <bugs@darcs.net>
<https://bugs.darcs.net/patch2358>
__________________________________
_______________________________________________
darcs-devel mailing list
darcs-devel@osuosl.org
https://lists.osuosl.org/mailman/listinfo/darcs-devel
[prev in list] [next in list] [prev in thread] [next in thread]