Re: Write-up on "tree repositories" as an alternative to conflictors
Ben Franksen <[email protected]> Sun, 13 Dec 2020 11:16:33 +0100
| Newsgroups | gmane.comp.version-control.darcs.user |
|---|---|
| Message-ID | <[email protected]> |
QW0gMTIuMTIuMjAgdW0gMTg6MjIgc2NocmllYiBKYW1lcyBDb29rOgo+IE9uIFNhdCwgRGVjIDEy LCAyMDIwIGF0IDAyOjMyOjA3UE0gKzAxMDAsIEJlbiBGcmFua3NlbiB3cm90ZToKPj4gQW0gMTIu MTIuMjAgdW0gMTE6NTYgc2NocmllYiBCZW4gRnJhbmtzZW46Cj4+PiBBbm90aGVyIGFzcGVjdCBu b3QgY292ZXJlZCBpcyB0aGF0IGZvciBwZXJtdXRpdml0eSB0byBob2xkLCB3ZSBuZWVkIG5vdAo+ Pj4gb25seSBlbnN1cmUgYSAvbWluaW11bS8gbnVtYmVyIG9mIHBhcmFsbGVsIHBhdGhzLCBidXQg YWxzbyBhIC9tYXhpbXVtLwo+Pj4gbnVtYmVyIG9mIGludGVybWVkaWF0ZSBjb250ZXh0cy4gVGhl IGV4dHJlbWUgY2FzZSBpcyB0aGUgY29tbXV0aW5nCj4+PiBoeXBlcmN1YmUgb2YgZGltZW5zaW9u IG4gd2l0aCBuISBkaWZmZXJlbnQgcGF0aHMgb2YgbGVuZ3RoIG4gKGFsbAo+Pj4gcGVybXV0YXRp b25zIG9mIG4pLCBzaGFyaW5nIDJebiBjb250ZXh0cyAodGhlIGNvcm5lcnMgb2YgdGhlIGh5cGVy Y3ViZSkuCj4+Cj4+IEluZGVlZCwgaXQgc2hvdWxkIGJlIHBvc3NpYmxlIHRvIGVtYmVkIChpbmpl Y3QpIGFueSBwYXRjaCBncmFwaCBpbnRvIGFuCj4+IE4tZGltZW5zaW9uYWwgaHlwZXJjdWJlLCB3 aGVyZSBOIGlzIHRoZSBzZXQgb2YgbmF0dXJhbCBudW1iZXJzLiBJIGZpbmQKPj4gdGhpcyB2aWV3 IHF1aXRlIGlsbHVtaW5hdGluZy4KPj4KPj4gKFdlIGhhdmUgdG8gcmVzdHJpY3QgbmFtZXMgYW5k IGNvbnRleHRzIHRvIChhdCBtb3N0KSBjb3VudGFibGUgc2V0cywKPj4gd2hpY2ggaXMgbm90IGEg c2VyaW91cyBsaW1pdGF0aW9uLCBzaW5jZSB0aGlzIHdpbGwgYmUgdGhlIGNhc2UgaW4gYW55Cj4+ IHByYWN0aWNhbCBpbXBsZW1lbnRhdGlvbiBhbnl3YXkuKQo+Pgo+PiBUaGUgY29udGV4dHMgY29y cmVzcG9uZCB0byBjb3JuZXJzIGkuZS4gZWxlbWVudHMgb2YgezAsMX1eTiwgYW5kIHRoZQo+PiBw YXRjaGVzIGNvcnJlc3BvbmQgdG8gZWRnZXMuIEVkZ2VzIHJlcHJlc2VudGluZyBwYXRjaGVzIGFy ZSBjb25zaWRlcmVkCj4+IGRpcmVjdGVkICJhd2F5IGZyb20gdGhlIG9yaWdpbiIuIFRoZSBuYW1l cyBhcmUgdGhlIChtdXR1YWxseSBvcnRob2dvbmFsKQo+PiAiZGlyZWN0aW9ucyIgaW4gb3VyIHNw YWNlOiB0d28gcGF0Y2hlcyBoYXZlIHRoZSBzYW1lIG5hbWUgaWYgYW5kIG9ubHkgaWYKPj4gdGhl eSBhcmUgL2dlb21ldHJpY2FsbHkvIHBhcmFsbGVsIGFzIGVkZ2VzLgo+Pgo+PiBXZSBldmVuIGdl dCBhIGRpc3Rpbmd1aXNoZWQgImVtcHR5IGNvbnRleHQiIGZvciBmcmVlICh0aGUgb3JpZ2luKS4K Pj4KPj4gQ29ybmVycyBjYW4gYmUgc2VlbiBhcyBzZXF1ZW5jZXMgb2YgYml0cyAod2l0aCBvbmx5 IGZpbml0ZWx5IG1hbnkgMXMpLAo+PiBhbmQgYSBwYXRjaCBwOnMtPnQgd2l0aCBuYW1lIG0gY29y cmVzcG9uZHMgdG8gdGhlIHRyaXBsZSAocyx0LG0pIHdoZXJlCj4+IHMobSk9MCwgdChtKT0xLCBh bmQgcyhpKT10KGkpIGZvciBhbGwgbmFtZXMgaSB3aXRoIGkvPW0uCj4gCj4gVGhpcyBpcyBzaW1p bGFyIHRvIG15IGF0dGVtcHQgIzIgZnJvbSB5ZXN0ZXJkYXkncyBlbWFpbCAoaW4gdGhhdAo+IGZv cm11bGF0aW9uLCBhIGNvbnRleHQgaXMgYSBzZXQgb2YgbmFtZXMsIHdoaWNoIGNvdWxkIGJlIHRo b3VnaHQgb2YgYXMKPiBhbiBlbGVtZW50IG9mIHswLDF9Xk4gaWYgeW91IHByZWZlcikuCgpBaCwg eWVzLiBJIGRpZG4ndCB1bmRlcnN0YW5kIGl0IGluIHlvdXIgZm9ybXVsYXRpb24gYXQgZmlyc3Qs IGJ1dCBvZgpjb3Vyc2UgdGhpcyBpcyBmdWxseSBlcXVpdmFsZW50LiBJbmRlZWQsIGEgY29udGV4 dCBpcyB1bmlxdWVseQpjaGFyYWN0ZXJpc2VkIGJ5IHRoZSBuYW1lcyBvZiBhbnkgc2VxdWVuY2Ug b2YgcGF0Y2hlcyB0aGF0IGxlYWRzIHVwIHRvCml0LCBmcm9tIHRoZSBvcmlnaW4gaS5lLiBlbXB0 eSBjb250ZXh0LgoKPj4gR2l2ZW4gdHdvIGFyYml0cmFyeSBjb3JuZXJzIHMgYW5kIHQsIGFsbCBw YXRocyBwOnMtPnQgbXVzdCBoYXZlIHRoZSBzYW1lCj4+IGxlbmd0aCBuLCB3aGljaCBjb2luY2lk ZXMgd2l0aCB0aGUgc2l6ZSBvZiBuYW1lKHApLiBJbiBvdGhlciB3b3JkcywgdGhleQo+PiBsaWUg aW5zaWRlIGEgZmluaXRlIG4tZGltZW5zaW9uYWwgaHlwZXJmYWNlIG9mIHRoZSBmdWxsIE4tY3Vi ZS4KPj4KPj4gV2hhdCBkb2VzIHBlcm11dGl2aXR5IG1lYW4gaW4gdGhpcyBwaWN0dXJlPyBPciBh c2tlZCBkaWZmZXJlbnRseSwgaG93Cj4+IGNhbiB3ZSBjaGFyYWN0ZXJpemUgdGhlIHZhbGlkIHBh dGNoIGdyYXBocyBhcyBhIHN1YnNldCBvZiB0aGUgTi1jdWJlPwo+Pgo+PiBDaGVlcnMKPj4gQmVu Cj4gCj4gVHJhbnNsYXRpbmcgbXkgYXR0ZW1wdCAjMiB0byB0aGVzZSB0ZXJtcywgSSBwcm9wb3Nl IHRoaXMKPiBjaGFyYWN0ZXJpemF0aW9uOgo+IAo+IGEpIEZpcnN0LCB3ZSBvbmx5IHVzZSBhIHN1 YnNldCBvZiB0aGUgbm9kZXMgb2YgdGhlIGh5cGVyY3ViZS4gRWFjaCBub2RlCj4gICAgaXMgZWl0 aGVyICJwcmVzZW50IiBvciBub3QuIChUaGluayBvZiBhICJub3QgcHJlc2VudCIgbm9kZSBhcwo+ ICAgIHJlcHJlc2VudGluZyBhIHNldCBvZiBuYW1lcyB3aXRoIGF0IGxlYXN0IG9uZSBjb25mbGlj dC4pCgpJIGZpbmQgdGhlIHRlcm0gImNvcm5lciIgbW9yZSBzdWdnZXN0aXZlIHRoYW4gIm5vZGUi LiBCdXQgeWVzLgoKPiBiKSBUaGUgYWxsLXplcm8gbm9kZSBpcyBwcmVzZW50LgoKWWVzLgoKPiBj KSBBbiBlZGdlL3BhdGNoIGV4aXN0cyBpZmYgaXRzIHN0YXJ0IGFuZCBlbmQgbm9kZXMgYXJlIHBy ZXNlbnQuCgpZZXMuIFZlcnkgbmljZSBzaW1wbGlmaWNhdGlvbi4KCj4gZCkgSWYgbm9kZXMgYzEs IGMyLCBjMyBhcmUgcHJlc2VudCwgYW5kIGMxIOKKhiBjMyBhbmQgYzIg4oqGIGMzLCB0aGVuCj4g ICAgYzEg4oiqIGMyIGlzIGFsc28gcHJlc2VudC4KCkludGVyZXN0aW5nISBTbyBjb3JuZXJzIChw b3RlbnRpYWwgY29udGV4dHMpIGhhdmUgYW4gaW5oZXJlbnQgcGFydGlhbApvcmRlciwgaW5kZWVk IHRoZXkgZm9ybSBhIGpvaW4tc2VtaWxhdHRpY2UuIFlvdSBwb3N0dWxhdGUgdGhhdCBpZiB0d28K Y29udGV4dHMgaGF2ZSBhbiB1cHBwZXIgYm91bmQgdGhhdCBpcyBhbHNvIGEgY29udGV4dCwgdGhl biB0aGUgbWluaW1hbAp1cHBlciBib3VuZCBtdXN0IGFsc28gYmUgYSBjb250ZXh0LiBJIHRoaW5r IHRoZSBtYXRoIHRlcm0gd291bGQgYmUgdGhhdApjb250ZXh0cyBmb3JtIGEgc3ViLXNlbWlsYXR0 aWNlIG9mIHRoZSBjb3JuZXJzLgoKSXQncyBmdW5ueSBob3cgdGhpcyBicmluZ3MgdXMgYWxsIHRo ZSB3YXkgYmFjayB0byB0aGUgaWRlYXMgaW4geW91cgpmaXJzdCBwYXBlcjogaW5zdGVhZCBvZiBm b2N1c2luZyBvbiBwYXRjaGVzIG9yIHBhdGhzLCB3ZSBub3cgZm9jdXMKYWxtb3N0IGNvbXBsZXRl bHkgb24gY29udGV4dHMuIEFuZCB0aGF0IG1ha2VzIGEgbG90IG9mIHNlbnNlLCBzaW5jZQpwYXJh bGxlbCBwYXRocyBhcmUgc3VwcG9zZWQgdG8gYmUgImVxdWl2YWxlbnQiIGFueXdheS4gSXQgc2hv dWxkbid0IG1ha2UKYSBkaWZmZXJlbmNlICpob3cqIGV4YWN0bHkgd2UgYXJyaXZlIGF0IGEgY29u dGV4dCwgYXMgbG9uZyBhcyB0aGVyZSBpcwoqYW55KiBwYXRoIHRoYXQgZW5kcyB0aGVyZS4KCkFu ZCBpZiB3ZSB0aHVzIGlkZW50aWZ5IGEgY29udGV4dCBjIHdpdGggdGhlIHNldCBvZiAoZXF1aXZh bGVudCkgcGF0aHMKZnJvbSB0aGUgb3JpZ2luIHRvIGMsIHRoZW4gYXhpb20gKGQpIGdpdmVzIHVz IHRoZSBleGlzdGVuY2Ugb2YgYSBjbGVhbgptZXJnZSBvZiB0d28gY29udGV4dHMvcmVwb3MsIGF0 IGxlYXN0IGlmIHdlIGtub3cgdGhhdCBzb21lb25lIHNvbWV3aGVyZQpoYXMgYSByZXBvIGNvaW50 YWluaW5nIGJvdGggb3VyIHBhdGNoZXMuCgo+IEZvciBleGFtcGxlLCBJIHRoaW5rIHdlIGNhbiBw cm92ZSB0aGUgZm9sbG93aW5nIHByb3BlcnR5IGZyb20geW91cgo+IHByZXZpb3VzIGVtYWlsOgo+ IAo+ICAgW2ZvciBhbnkgcGFyYWxsZWwgcGF0aHMgcCBhbmQgcV0gZm9yIGV2ZXJ5IG4gaW4gbmFt ZShwKT1uYW1lKHEpLCBhbmQKPiAgIGZvciBlYWNoIGkgaW4gcG9zKHAsbikuLnBvcyhxLG4pLCB0 aGVyZSBleGlzdHMgYSBwYXJhbGxlbCBwYXRoIHIsCj4gICBzdWNoIHRoYXQgaT1wb3MocixuKS4K PiAKPiBQcm9vZjoKPiAKPiBXaXRob3V0IGxvc3Mgb2YgZ2VuZXJhbGl0eSwgYXNzdW1lIHBvcyhw LG4pIDw9IHBvcyhxLG4pLgo+IAo+IFdyaXRlIHAgPSBwMCBhIHAxIGFuZCBxID0gcTAgYScgcTEg d2hlcmUgbmFtZShhKSA9IG5hbWUoYScpID0gbi4gU28KPiBsZW5ndGgocDApID0gcG9zKHAsbikg YW5kIGxlbmd0aChxMCkgPSBwb3MocSxuKS4KPiAKPiBMZXQgcTAnIGJlIGEgcHJlZml4IG9mIHEw IHN1Y2ggdGhhdCB8bmFtZShxMCcpIOKIqiBuYW1lKHAwKXwgPSBwb3MocSxuKS4KPiAKPiBMZXQg WCA9IG5hbWUocTAnKSDiiKogbmFtZShwMCkuIEJ5IHByb3BlcnR5IChkKSwgbm9kZSBYIGlzIHBy ZXNlbnQgaW4gdGhlCj4gcGF0Y2ggdGhlb3J5ICh0YWtpbmcgYzEgPSBlbmQocTAnKSwgYzIgPSBl bmQocDApLCBjMyA9IGVuZChwKSA9IGVuZChxKS4KPiAKPiBYIOKIqiB7bn0gaXMgYWxzbyBwcmVz ZW50LCBhZ2FpbiBieSBwcm9wZXJ0eSAoZCkgKHRha2luZyBjMSA9IGVuZChxMCcpIOKIqgo+IHtu fSwgYzIgPSBlbmQocDApIOKIqiB7bn0sIGMzID0gZW5kKHApID0gZW5kKHEpKS4KPiAKPiBCeSBM ZW1tYSAxIChiZWxvdykgdGhlcmUgZXhpc3RzIGEgcGF0aCBmcm9tIHN0YXJ0KHApIHRvIFgsIGFu ZCBhbHNvIGEKPiBwYXRoIGZyb20gWCDiiKoge259IHRvIGVuZChwKS4gQnkgcHJvcGVydHkgKGMp LCB0aGVyZSdzIGFsc28gYW4gZWRnZSBmcm9tCj4gWCB0byBYIOKIqiB7bn0gKHdpdGggbmFtZSBu KS4gQ29uY2F0ZW5hdGUgdGhlc2UgdGhyZWUgdG8gZ2V0IHRoZSBkZXNpcmVkIHBhdGguCj4gCj4g UUVECj4gCj4gTGVtbWEgMQo+IAo+IElmIHRoZSBub2Rlcy9jb250ZXh0cyBjIGFuZCBkIGFyZSBw cmVzZW50IGFuZCBjIOKKhiBkLCB0aGVyZSBpcyBhIHBhdGgKPiBmcm9tIGMgdG8gZC4KPiAKPiBQ cm9vZgo+IAo+IElmIGMgPSBkLCB0YWtlIHRoZSBlbXB0eSBwYXRoLgo+IAo+IE90aGVyd2lzZSwg bGV0IG4gYmUgYW55IG5hbWUgaW4gZCBcIGMuIEJ5IHByb3BlcnR5IChkKSwgdGFraW5nIGMxID0g YywKPiBjMiA9IGMg4oiqIHtufSBhbmQgYzMgPSBkLCB0aGUgbm9kZSBjIOKIqiB7bn0gaXMgcHJl c2VudC4KPiAKPiBCeSBwcm9wZXJ0eSAoYyksIHRoZXJlIGlzIGFuIGVkZ2UgZnJvbSBjIHRvIGMg 4oiqIHtufS4gVXNlIHRoYXQgYXMgdGhlCj4gZmlyc3QgZWRnZSBvZiB0aGUgcGF0aC4gTm90ZSB0 aGF0IGMg4oiqIHtufSDiioYgZDsgd2UgY2FuIGFwcGx5IHRoZSBsZW1tYQo+IGFnYWluICh1c2lu ZyBpbmR1Y3Rpb24pIHRvIGNvbXBsZXRlIHRoZSBwYXRoLgo+IAo+IFFFRAoKTmljZSEKCkhvd2V2 ZXIsIHJlbWVtYmVyIHlvdXIgY291bnRlciBleGFtcGxlIG9mIGEgcGF0Y2ggdW5pdmVyc2Ugd2l0 aCBvbmx5IHR3bwpwYXRocyB3aXRoIG5hbWVzIGFiYyBhbmQgY2JhLiBGcm9tIHRoZSBwcmVzZW5j ZSBvZiBib3RoIHthfSBhbmQge2N9IHdlCmNhbiBkZWR1Y2UgdGhhdCBvZiB7YSxjfSwgYnV0IGl0 IHNlZW1zIGltcG9zc2libGUgdG8gcHJvdmUgdGhhdCB7Yn0gaXMKcHJlc2VudC4gRm9yIHRoYXQg d2UgbmVlZCBhIGZpZnRoIGF4aW9tIChlKSBhbmFsb2dvdXMgdG8gKGQpIGJ1dCB3aXRoCmludGVy c2VjdGlvbnMgaW5zdGVhZCBvZiB1bmlvbnM6CgplKSBJZiBub2RlcyBjMSBhbmQgYzIgYXJlIHBy ZXNlbnQsIHRoZW4gYzEg4oipIGMyIGlzIGFsc28gcHJlc2VudC4KClRoaXMgbWVhbnMgdGhhdCB0 aGUgKHByZXNlbnQpIGNvbnRleHRzIG11c3QgYmUgYSBzdWJsYXR0aWNlIG9mIHRoZQpjb3JuZXJz LiBJbiB0aGUgY291bnRlciBleGFtcGxlLCB0aGUgZXhpc3RlbmNlIG9mIHthLGJ9IGFuZCB7Yyxi fSB0aGVuCmltcGx5IHRoZSBleGlzdGVuY2Ugb2Yge2J9IGFuZCB0aGVyZWZvcmUgb2YgdGhlIGZ1 bGwgMy1jdWJlLgoKTm90ZSB0aGF0IG91ciBsYXR0aWNlIG9mIChwcmVzZW50KSBjb250ZXh0cyBo YXMgYSBib3R0b20gZWxlbWVudCAodGhlCmVtcHR5IGNvbnRleHQpIGJ1dCBubyB0b3AgZWxlbWVu dCAodW5sZXNzIHRoZSBzZXQgb2YgbmFtZXMgaXMgZmluaXRlKSwKd2hpY2ggbWFrZXMgZm9ybXVs YXRpbmcgKGUpIGVhc2llciB0aGFuIChkKS4KCkNoZWVycwpCZW4KCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRhcmNzLXVzZXJzIG1haWxpbmcgbGlzdApk YXJjcy11c2Vyc0Bvc3Vvc2wub3JnCmh0dHBzOi8vbGlzdHMub3N1b3NsLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RhcmNzLXVzZXJzCg==