5 ms·
Would love to see more explanation (with diagrams) of their patching model. Right now I'm not convinced it has any intuitive advantage.
by aratno 10y ago
Would love to see more explanation (with diagrams) of their patching model. Right now I'm not convinced it has any intuitive advantage.
- tupshin 10y agoThis might be deeper than you are looking for, but this is the theory it's based on, and even has diagrams. :) https://arxiv.org/abs/1311.3903 https://arxiv.org/abs/1311.3903
- vesinisa 10y agoHere is one concrete example compared to git I found digging around: https://tahoe-lafs.org/~zooko/badmerge/simple.html https://tahoe-lafs.org/~zooko/badmerge/simple.html
- krupan 10y agoFor anyone following along still, I just tried the bad merge example that vesinisia linked to with both git and mercurial. Git does indeed do the wrong thing as illustrated on that web page. Mercurial gets it right. UPDATE: both git and mercurial get the concrete version wrong (https://tahoe-lafs.org/~zooko/badmerge/concrete-good-semantics.html https://tahoe-lafs.org/~zooko/badmerge/concrete-good-semanti...)