[darcs-users] How to extend a patch theory to fully commute

[Ben Franksen]

Am 01.10.20 um 01:10 schrieb James Cook:
> Thanks. I have not read through the details in the camp paper or the
> Darcs V3 source code yet, but I think your explanation of conflictors
> above, and the connection to the tree point of view, gives me some good
> intuition to start with.
> 
> I wonder if some of this could go on the wiki?

Feel free to copy anything I write here to the wiki or add new pages. I
am personally not too fond of wiki editing since (a) the formatting is
too tedious and (b) the information usually gets out of date pretty soon
(and nobody ever fixes it or removes obsolete information).

>> I still wonder if a consistent patch theory *different* from
>> camp/darcs-3 could be devised in which conflict resolutions really are
>> freely exchangeable with the conflicted patches instead of depending on
>> them. In other words, we may *choose* one of the conflicting patches as
>> the resolution (creating a new one if none are suitable). I think this
>> would require, in the tree view, to add a special flag to mark such
>> patches as the chosen resolution. This would make the theory more
>> symmetric and would perhaps also make resolving conflicts easier to
>> handle; and perhaps simplify commute and merge, too. I haven't thought
>> this through, though, and it may turn out that this doesn't work.
>>
>> Cheers
>> Ben
> 
> I think the goal I described in my other email just now would end up
> looking something like this, but with inverses on all the not-chosen
> branches instead of a flag on the chosen branch.

Let me know if you have something concrete that looks promising.

Cheers
Ben