3 ms·
Speed is about the only user-facing difference. But the big user-facing difference is that commits are glued to their parents. They really are glued; the merges
by jordigh 10y ago
Speed is about the only user-facing difference. But the big user-facing difference is that commits are glued to their parents. They really are glued; the merges and potential conflicts involved with rebasing and cherry-picking are a consequence of trying to undo this glue.
Darcs' and pijuls' patches aren't glued, they only either commute or do not, and the conflict resolution mechanisms for non-commutative patches are different.
- krupan 10y agoWhat does commute mean in this context? I'm getting the impression that it means that the original line of code that the patch references and is going to change is where the patch expects it to be.
- jordigh 10y agoIt's probably best to get this from the source: https://en.wikibooks.org/wiki/Understanding_Darcs/Patch_theory#Commutation https://en.wikibooks.org/wiki/Understanding_Darcs/Patch_theo...