Re: Write-up on "tree repositories" as an alternative to conflictors
James Cook <[email protected]> Sat, 12 Dec 2020 17:22:32 +0000
| Newsgroups | gmane.comp.version-control.darcs.user |
|---|---|
| Message-ID | <[email protected]> |
T24gU2F0LCBEZWMgMTIsIDIwMjAgYXQgMDI6MzI6MDdQTSArMDEwMCwgQmVuIEZyYW5rc2VuIHdy b3RlOgo+IEFtIDEyLjEyLjIwIHVtIDExOjU2IHNjaHJpZWIgQmVuIEZyYW5rc2VuOgo+ID4gQW5v dGhlciBhc3BlY3Qgbm90IGNvdmVyZWQgaXMgdGhhdCBmb3IgcGVybXV0aXZpdHkgdG8gaG9sZCwg d2UgbmVlZCBub3QKPiA+IG9ubHkgZW5zdXJlIGEgL21pbmltdW0vIG51bWJlciBvZiBwYXJhbGxl bCBwYXRocywgYnV0IGFsc28gYSAvbWF4aW11bS8KPiA+IG51bWJlciBvZiBpbnRlcm1lZGlhdGUg Y29udGV4dHMuIFRoZSBleHRyZW1lIGNhc2UgaXMgdGhlIGNvbW11dGluZwo+ID4gaHlwZXJjdWJl IG9mIGRpbWVuc2lvbiBuIHdpdGggbiEgZGlmZmVyZW50IHBhdGhzIG9mIGxlbmd0aCBuIChhbGwK PiA+IHBlcm11dGF0aW9ucyBvZiBuKSwgc2hhcmluZyAyXm4gY29udGV4dHMgKHRoZSBjb3JuZXJz IG9mIHRoZSBoeXBlcmN1YmUpLgo+IAo+IEluZGVlZCwgaXQgc2hvdWxkIGJlIHBvc3NpYmxlIHRv IGVtYmVkIChpbmplY3QpIGFueSBwYXRjaCBncmFwaCBpbnRvIGFuCj4gTi1kaW1lbnNpb25hbCBo eXBlcmN1YmUsIHdoZXJlIE4gaXMgdGhlIHNldCBvZiBuYXR1cmFsIG51bWJlcnMuIEkgZmluZAo+ IHRoaXMgdmlldyBxdWl0ZSBpbGx1bWluYXRpbmcuCj4gCj4gKFdlIGhhdmUgdG8gcmVzdHJpY3Qg bmFtZXMgYW5kIGNvbnRleHRzIHRvIChhdCBtb3N0KSBjb3VudGFibGUgc2V0cywKPiB3aGljaCBp cyBub3QgYSBzZXJpb3VzIGxpbWl0YXRpb24sIHNpbmNlIHRoaXMgd2lsbCBiZSB0aGUgY2FzZSBp biBhbnkKPiBwcmFjdGljYWwgaW1wbGVtZW50YXRpb24gYW55d2F5LikKPiAKPiBUaGUgY29udGV4 dHMgY29ycmVzcG9uZCB0byBjb3JuZXJzIGkuZS4gZWxlbWVudHMgb2YgezAsMX1eTiwgYW5kIHRo ZQo+IHBhdGNoZXMgY29ycmVzcG9uZCB0byBlZGdlcy4gRWRnZXMgcmVwcmVzZW50aW5nIHBhdGNo ZXMgYXJlIGNvbnNpZGVyZWQKPiBkaXJlY3RlZCAiYXdheSBmcm9tIHRoZSBvcmlnaW4iLiBUaGUg bmFtZXMgYXJlIHRoZSAobXV0dWFsbHkgb3J0aG9nb25hbCkKPiAiZGlyZWN0aW9ucyIgaW4gb3Vy IHNwYWNlOiB0d28gcGF0Y2hlcyBoYXZlIHRoZSBzYW1lIG5hbWUgaWYgYW5kIG9ubHkgaWYKPiB0 aGV5IGFyZSAvZ2VvbWV0cmljYWxseS8gcGFyYWxsZWwgYXMgZWRnZXMuCj4gCj4gV2UgZXZlbiBn ZXQgYSBkaXN0aW5ndWlzaGVkICJlbXB0eSBjb250ZXh0IiBmb3IgZnJlZSAodGhlIG9yaWdpbiku Cj4gCj4gQ29ybmVycyBjYW4gYmUgc2VlbiBhcyBzZXF1ZW5jZXMgb2YgYml0cyAod2l0aCBvbmx5 IGZpbml0ZWx5IG1hbnkgMXMpLAo+IGFuZCBhIHBhdGNoIHA6cy0+dCB3aXRoIG5hbWUgbSBjb3Jy ZXNwb25kcyB0byB0aGUgdHJpcGxlIChzLHQsbSkgd2hlcmUKPiBzKG0pPTAsIHQobSk9MSwgYW5k IHMoaSk9dChpKSBmb3IgYWxsIG5hbWVzIGkgd2l0aCBpLz1tLgoKVGhpcyBpcyBzaW1pbGFyIHRv IG15IGF0dGVtcHQgIzIgZnJvbSB5ZXN0ZXJkYXkncyBlbWFpbCAoaW4gdGhhdApmb3JtdWxhdGlv biwgYSBjb250ZXh0IGlzIGEgc2V0IG9mIG5hbWVzLCB3aGljaCBjb3VsZCBiZSB0aG91Z2h0IG9m IGFzCmFuIGVsZW1lbnQgb2YgezAsMX1eTiBpZiB5b3UgcHJlZmVyKS4KCj4gR2l2ZW4gdHdvIGFy Yml0cmFyeSBjb3JuZXJzIHMgYW5kIHQsIGFsbCBwYXRocyBwOnMtPnQgbXVzdCBoYXZlIHRoZSBz YW1lCj4gbGVuZ3RoIG4sIHdoaWNoIGNvaW5jaWRlcyB3aXRoIHRoZSBzaXplIG9mIG5hbWUocCku IEluIG90aGVyIHdvcmRzLCB0aGV5Cj4gbGllIGluc2lkZSBhIGZpbml0ZSBuLWRpbWVuc2lvbmFs IGh5cGVyZmFjZSBvZiB0aGUgZnVsbCBOLWN1YmUuCj4gCj4gV2hhdCBkb2VzIHBlcm11dGl2aXR5 IG1lYW4gaW4gdGhpcyBwaWN0dXJlPyBPciBhc2tlZCBkaWZmZXJlbnRseSwgaG93Cj4gY2FuIHdl IGNoYXJhY3Rlcml6ZSB0aGUgdmFsaWQgcGF0Y2ggZ3JhcGhzIGFzIGEgc3Vic2V0IG9mIHRoZSBO LWN1YmU/Cj4gCj4gQ2hlZXJzCj4gQmVuCgpUcmFuc2xhdGluZyBteSBhdHRlbXB0ICMyIHRvIHRo ZXNlIHRlcm1zLCBJIHByb3Bvc2UgdGhpcwpjaGFyYWN0ZXJpemF0aW9uOgoKYSkgRmlyc3QsIHdl IG9ubHkgdXNlIGEgc3Vic2V0IG9mIHRoZSBub2RlcyBvZiB0aGUgaHlwZXJjdWJlLiBFYWNoIG5v ZGUKICAgaXMgZWl0aGVyICJwcmVzZW50IiBvciBub3QuIChUaGluayBvZiBhICJub3QgcHJlc2Vu dCIgbm9kZSBhcwogICByZXByZXNlbnRpbmcgYSBzZXQgb2YgbmFtZXMgd2l0aCBhdCBsZWFzdCBv bmUgY29uZmxpY3QuKQoKYikgVGhlIGFsbC16ZXJvIG5vZGUgaXMgcHJlc2VudC4KCmMpIEFuIGVk Z2UvcGF0Y2ggZXhpc3RzIGlmZiBpdHMgc3RhcnQgYW5kIGVuZCBub2RlcyBhcmUgcHJlc2VudC4K CmQpIElmIG5vZGVzIGMxLCBjMiwgYzMgYXJlIHByZXNlbnQsIGFuZCBjMSDiioYgYzMgYW5kIGMy IOKKhiBjMywgdGhlbgogICBjMSDiiKogYzIgaXMgYWxzbyBwcmVzZW50LgoKRm9yIGV4YW1wbGUs IEkgdGhpbmsgd2UgY2FuIHByb3ZlIHRoZSBmb2xsb3dpbmcgcHJvcGVydHkgZnJvbSB5b3VyCnBy ZXZpb3VzIGVtYWlsOgoKICBbZm9yIGFueSBwYXJhbGxlbCBwYXRocyBwIGFuZCBxXSBmb3IgZXZl cnkgbiBpbiBuYW1lKHApPW5hbWUocSksIGFuZAogIGZvciBlYWNoIGkgaW4gcG9zKHAsbikuLnBv cyhxLG4pLCB0aGVyZSBleGlzdHMgYSBwYXJhbGxlbCBwYXRoIHIsCiAgc3VjaCB0aGF0IGk9cG9z KHIsbikuCgpQcm9vZjoKCldpdGhvdXQgbG9zcyBvZiBnZW5lcmFsaXR5LCBhc3N1bWUgcG9zKHAs bikgPD0gcG9zKHEsbikuCgpXcml0ZSBwID0gcDAgYSBwMSBhbmQgcSA9IHEwIGEnIHExIHdoZXJl IG5hbWUoYSkgPSBuYW1lKGEnKSA9IG4uIFNvCmxlbmd0aChwMCkgPSBwb3MocCxuKSBhbmQgbGVu Z3RoKHEwKSA9IHBvcyhxLG4pLgoKTGV0IHEwJyBiZSBhIHByZWZpeCBvZiBxMCBzdWNoIHRoYXQg fG5hbWUocTAnKSDiiKogbmFtZShwMCl8ID0gcG9zKHEsbikuCgpMZXQgWCA9IG5hbWUocTAnKSDi iKogbmFtZShwMCkuIEJ5IHByb3BlcnR5IChkKSwgbm9kZSBYIGlzIHByZXNlbnQgaW4gdGhlCnBh dGNoIHRoZW9yeSAodGFraW5nIGMxID0gZW5kKHEwJyksIGMyID0gZW5kKHAwKSwgYzMgPSBlbmQo cCkgPSBlbmQocSkuCgpYIOKIqiB7bn0gaXMgYWxzbyBwcmVzZW50LCBhZ2FpbiBieSBwcm9wZXJ0 eSAoZCkgKHRha2luZyBjMSA9IGVuZChxMCcpIOKIqgp7bn0sIGMyID0gZW5kKHAwKSDiiKoge259 LCBjMyA9IGVuZChwKSA9IGVuZChxKSkuCgpCeSBMZW1tYSAxIChiZWxvdykgdGhlcmUgZXhpc3Rz IGEgcGF0aCBmcm9tIHN0YXJ0KHApIHRvIFgsIGFuZCBhbHNvIGEKcGF0aCBmcm9tIFgg4oiqIHtu fSB0byBlbmQocCkuIEJ5IHByb3BlcnR5IChjKSwgdGhlcmUncyBhbHNvIGFuIGVkZ2UgZnJvbQpY IHRvIFgg4oiqIHtufSAod2l0aCBuYW1lIG4pLiBDb25jYXRlbmF0ZSB0aGVzZSB0aHJlZSB0byBn ZXQgdGhlIGRlc2lyZWQgcGF0aC4KClFFRAoKTGVtbWEgMQoKSWYgdGhlIG5vZGVzL2NvbnRleHRz IGMgYW5kIGQgYXJlIHByZXNlbnQgYW5kIGMg4oqGIGQsIHRoZXJlIGlzIGEgcGF0aApmcm9tIGMg dG8gZC4KClByb29mCgpJZiBjID0gZCwgdGFrZSB0aGUgZW1wdHkgcGF0aC4KCk90aGVyd2lzZSwg bGV0IG4gYmUgYW55IG5hbWUgaW4gZCBcIGMuIEJ5IHByb3BlcnR5IChkKSwgdGFraW5nIGMxID0g YywKYzIgPSBjIOKIqiB7bn0gYW5kIGMzID0gZCwgdGhlIG5vZGUgYyDiiKoge259IGlzIHByZXNl bnQuCgpCeSBwcm9wZXJ0eSAoYyksIHRoZXJlIGlzIGFuIGVkZ2UgZnJvbSBjIHRvIGMg4oiqIHtu fS4gVXNlIHRoYXQgYXMgdGhlCmZpcnN0IGVkZ2Ugb2YgdGhlIHBhdGguIE5vdGUgdGhhdCBjIOKI qiB7bn0g4oqGIGQ7IHdlIGNhbiBhcHBseSB0aGUgbGVtbWEKYWdhaW4gKHVzaW5nIGluZHVjdGlv bikgdG8gY29tcGxldGUgdGhlIHBhdGguCgpRRUQKCi0tIApKYW1lcwpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkYXJjcy11c2VycyBtYWlsaW5nIGxpc3QK ZGFyY3MtdXNlcnNAb3N1b3NsLm9yZwpodHRwczovL2xpc3RzLm9zdW9zbC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kYXJjcy11c2Vycwo=