Re: Write-up on "tree repositories" as an alternative to conflictors
Ben Franksen <[email protected]> Mon, 14 Dec 2020 15:30:50 +0100
| Newsgroups | gmane.comp.version-control.darcs.user |
|---|---|
| Message-ID | <[email protected]> |
QW0gMTMuMTIuMjAgdW0gMTE6MTYgc2NocmllYiBCZW4gRnJhbmtzZW46Cj4gSG93ZXZlciwgcmVt ZW1iZXIgeW91ciBjb3VudGVyIGV4YW1wbGUgb2YgYSBwYXRjaCB1bml2ZXJzZSB3aXRoIG9ubHkg dHdvCj4gcGF0aHMgd2l0aCBuYW1lcyBhYmMgYW5kIGNiYS4gRnJvbSB0aGUgcHJlc2VuY2Ugb2Yg Ym90aCB7YX0gYW5kIHtjfSB3ZQo+IGNhbiBkZWR1Y2UgdGhhdCBvZiB7YSxjfSwgYnV0IGl0IHNl ZW1zIGltcG9zc2libGUgdG8gcHJvdmUgdGhhdCB7Yn0gaXMKPiBwcmVzZW50LiBGb3IgdGhhdCB3 ZSBuZWVkIGEgZmlmdGggYXhpb20gKGUpIGFuYWxvZ291cyB0byAoZCkgYnV0IHdpdGgKPiBpbnRl cnNlY3Rpb25zIGluc3RlYWQgb2YgdW5pb25zOgo+IAo+IGUpIElmIG5vZGVzIGMxIGFuZCBjMiBh cmUgcHJlc2VudCwgdGhlbiBjMSDiiKkgYzIgaXMgYWxzbyBwcmVzZW50LgoKVGhpcyBpcyBzdGls bCBub3QgcXVpdGUgaW5zdWZmaWNpZW50LiBXaXRoIHRoZSBuYXR1cmFsIG51bWJlcnMgYXMgdGhl CnNldCBvZiBuYW1lcywgYj17fSwgYW5kIHQ9ezEsMn0sIHRoZSBzZXQgQz17Yix0fSB3b3VsZCBi ZSBhIHZhbGlkIHNldCBvZgpjb250ZXh0cy4gQnV0IHRoZW4gdGhlcmUgaXMgbm8gcGF0aCBmcm9t IGIgdG8gdCAoaW4gZmFjdCB3ZSBoYXZlIG5vCnBhdGNoZXMgYXQgYWxsKS4gSW4gZ2VuZXJhbCBJ IHRoaW5rIHdlIHdhbnQgdGhlIHBhdGNoIGdyYXBoIHRvIGJlCmNvbm5lY3RlZC4gQSBwb3NzaWJs ZSBjaGFyYWN0ZXJpemF0aW9uIGluIHRlcm1zIG9mIGNvbnRleHRzIGNvdWxkIGJlOgoKKGYpIEZv ciBldmVyeSBub24tZW1wdHkgY29udGV4dCBjIHRoZXJlIGlzIGF0IGxlYXN0IG9uZSBlbGVtZW50 IG4gb2YgYywKICAgIHN1Y2ggdGhhdCBjXFx7bn0gaXMgYWxzbyBhIGNvbnRleHQuCgpJdCBpcyB0 aGVuIGVhc3kgdG8gc2hvdyB0aGF0IGEgcGF0aCBwOnMtPnQgZXhpc3RzIGlmIGFuZCBvbmx5IGlm IHMgaXMgYQpzdWJzZXQgb2YgdC4KClRoaXMgdmFyaWFudCBvZiBhYnN0cmFjdCBwYXRjaCB0aGVv cnkgaGFzIGNsZWFuIG1lcmdlIGFuZCB1bm1lcmdlIChvZgpjb250ZXh0cykgYWxyZWFkeSBidWls dC1pbiwgc28gdG8gc3BlYWssIHNpbmNlIG1lcmdpbmcgaXMganVzdCB0YWtpbmcKdGhlIHVuaW9u IGFuZCB1bm1lcmdpbmcgaXMgdGFraW5nIHRoZSBpbnRlcnNlY3Rpb24uIEkgZmluZCBpdAppbnRl cmVzdGluZyB0byBub3RlIHRoYXQgYWRkaW5nIGNvbmZsaWN0b3JzIGEgbGEgRGFyY3MgbWVhbnMg dGhhdCB3ZQplbmxhcmdlIHRoZSBzZXQgb2YgY29udGV4dHMgYnkgYWRkaW5nIC9jb25mbGljdGVk IHN0YXRlcy8sIHdoaWNoIGFyZQp0aG9zZSBjb3JuZXJzIHRoYXQgd2UgZ2V0IChpbiBhZGRpdGlv biB0byB0aGUgbm9ybWFsIHVuY29uZmxpY3RlZApjb250ZXh0cykgaWYgd2UgYWxsb3cgYXJiaXRy YXJ5IHVuaW9ucyBvZiBjb250ZXh0cy4gU2VlbiBpbiB0aGlzIHdheSwKY29uZmxpY3RvcnMgYXBw ZWFyIHF1aXRlIG5hdHVyYWwgYW5kIHNpbXBsZSwgY29uY2VwdHVhbGx5IGF0IGxlYXN0LgoKQW5v dGhlciBpbnRlcmVzdGluZyBvYnNlcnZhdGlvbiBpcyB0aGF0IHdlIGNhbiByZWdhcmQgYSBuYW1l IGFzIGEKcGFydGlhbCBiaWplY3Rpb24gYmV0d2VlbiBjb250ZXh0cy4gVGhlIGFjdGlvbiBvZiB0 aGUgZnVuY3Rpb24gaXMgdG8gYWRkCnRoZSBuYW1lIHRvIHRoZSBjb250ZXh0IGFuZCBpdHMgaW52 ZXJzZSBpcyB0byByZW1vdmUgaXQuIEl0cyBkb21haW4gYW5kCnJhbmdlIGFyZSBnaXZlbiBieQoK ICBkb21haW4obik9e2PiiIhDfG7iiIljIGFuZCBj4oiqe2594oiIQ30sIHJhbmdlKG4pPXtj4oiI Q3xu4oiIYyBhbmQgY1x7bn3iiIhDfQoKVGhlIHJlYXNvbiBJIGZpbmQgdGhpcyBpbnRlcmVzdGlu ZyBpcyB0aGF0IGl0IGhpbnRzIGF0IGEgcG9zc2liaWxpdHkgdG8KcmUtaW50cm9kdWNlIC9jb25j cmV0ZS8gcGF0Y2hlcyAodGhhdCBpcywgL3BhdGNoIGNvbnRlbnQvKSBpbnRvIHRoZQpwaWN0dXJl LiBDb25jcmV0ZSAocHJpbWl0aXZlKSBwYXRjaGVzIGNhbiBiZSBzZWVuIGFzIHBhcnRpYWwgYmlq ZWN0aW9ucwpvbiBhIHNldCBTIG9mIHN0YXRlcywgcmVwcmVzZW50ZWQgYXMgZGF0YS4gSGVyZSwg dG9vLCB3ZSBjYW4gZ2VuZXJhbGl6ZQp0byBmaW5pdGUgc2VxdWVuY2VzIG9mIHBhdGNoZXMsIHdo aWNoIHRoZW4gbmF0dXJhbGx5IGZvcm0gYSBjYXRlZ29yeSwKYW5kIHRoZXJlIGlzIGEgKG5vbi1p bmplY3RpdmUpIGZ1bmN0b3IgKHRoZSAiYXBwbHkiIGZ1bmN0b3IpIGZyb20gdGhhdApjYXRlZ29y eSB0byB0aGUgZ3JvdXBvaWQgb2YgcGFydGlhbCBiaWplY3Rpb25zIG9uIHN0YXRlcyB0aGF0IG1h cHMKY29uY2F0ZW5hdGlvbiB0byBmdW5jdGlvbiBjb21wb3NpdGlvbi4KCldlIG1heSB3YW50IHRv IHN0dWR5IGZ1bmN0b3JzIGZyb20gYW4gYWJzdHJhY3QgcGF0Y2ggdGhlb3J5IHRvIGEKY29uY3Jl dGUgb25lLiBBIGZ1bmN0b3IgbWFwcyBib3RoIG9iamVjdHMgYW5kIGFycm93cy4gRm9yIG9iamVj dHMsCkY6Qy0+UyBhc3NvY2lhdGVzIGEgY29uY3JldGUgc3RhdGUgdG8gZWFjaCBjb250ZXh0ICh0 aGlzIG1hcHBpbmcgaXMgYWxzbwpub3QgbmVjZXNzYXJpbHkgaW5qZWN0aXZlKS4gRm9yIGFycm93 cyBpdCBhc3NvY2lhdGVzIHRvIGVhY2ggcGF0aCBwOnMtPnQKYSBjb25jcmV0ZSBwYXRjaCBGKHAp OkYocyktPkYodCkuIFRoZSBmdW5jdG9yIGxhd3Mgc2F5IHRoYXQKRihpZF9jKT1pZF9GKGMpIGFu ZCB0aGF0IEYocDtxKT1GKHApO0YocSkuCgpUaGlzIGRvZXMgbm90IGEgcHJpb3JpIG1lYW4gdGhh dCBlYWNoIGFic3RyYWN0IC9wYXRjaC8gKHNpbmdsZXRvbiBwYXRoKQptYXBzIHRvIGEgY29uY3Jl dGUgcGF0Y2gsIHNvIEkgZ3Vlc3Mgd2UgaGF2ZSB0byByZXF1aXJlIHRoYXQsIGluCmFkZGl0aW9u IHRvIHRoZSB1c3VhbCBmdW5jdG9yIGxhd3MuIFRoZXJlIG1heSBiZSBhIGZldyBtb3JlIGV4dHJh CnJlcXVpcmVtZW50cyB0aGF0IHdlIHdhbnQgdG8gaW1wb3NlLiBGb3IgaW5zdGFuY2UsIEkgZ3Vl c3Mgd2UgbmVlZCBzb21lCnNvcnQgb2YgY29uc2lzdGVuY3kgcmVxdWlyZW1lbnQgdGhhdCByZWxh dGVzIGNvbW11dGF0aW9uIGluIHRoZSBhYnN0cmFjdApzZXR0aW5nIHRvIHRoYXQgaW4gdGhlIGNv bmNyZXRlIHNldHRpbmcuIE5lZWRsZXNzIHRvIHNheSwgSSBoYXZlbid0CnRob3VnaHQgdGhlc2Ug dGhpbmdzIHRocm91Z2ggdG8gdGhlIGVuZCwgc28gSSBjYW4ndCB0ZWxsIHlldCBpZiBpdCBoYXMK YW55IHByYWN0aWNhbCByZWxldmFuY2UuCgpDaGVlcnMKQmVuCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkYXJjcy11c2VycyBtYWlsaW5nIGxpc3QKZGFy Y3MtdXNlcnNAb3N1b3NsLm9yZwpodHRwczovL2xpc3RzLm9zdW9zbC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kYXJjcy11c2Vycwo=