Re: Write-up on "tree repositories" as an alternative to conflictors
James Cook <[email protected]> Fri, 11 Dec 2020 23:13:19 +0000
| Newsgroups | gmane.comp.version-control.darcs.user |
|---|---|
| Message-ID | <[email protected]> |
PiBZb3UgYXJlIHJpZ2h0LiBTdWNoIGEgc2NlbmFyaW8gbXVzdCBub3QgYmUgYWxsb3dlZCBhbmQg dGhlICJnbG9iYWwiCj4gZGVmaW5pdGlvbiBvZiBwYXRjaCBncmFwaCBJIGdhdmUgaXMgdG9vIHdl YWsgdG8gZXhjbHVkZSBpdC4gSWYgeW91Cj4gYW5hbHlzZSB0aGUgY291bnRlciBleGFtcGxlIGZy b20gdGhlIFBPViBvZiBwZXJtdXRhdGlvbnMgb2YgbmFtZXMsIHdoYXQKPiB3ZSBoYXZlIGhlcmUg aXMgKGluZGVlZCB0aGUgc2ltcGxlc3QgZXhhbXBsZSBvZikgYSBwZXJtdXRhdGlvbiBncm91cAo+ IHRoYXQgaXMgbm90IGdlbmVyYXRlZCBieSBhZGphY2VudCB0cmFuc3Bvc2l0aW9ucy4gSWYgd2Ug YnVpbGQgYSBwYXRjaAo+IHRoZW9yeSBib3R0b20tdXAgc3RhcnRpbmcgd2l0aCBjb21tdXRhdGlv biBvZiBzaW5nbGUgcGF0Y2hlcywgdGhlbiB0aGlzCj4gY2Fubm90IGhhcHBlbjogdGhlIHNldCBv ZiBwYXJhbGxlbCBwYXRocyBmcm9tIHMgdG8gdCBhbHdheXMgbWFwcyB0byBhCj4gcGVybXV0YXRp b24gZ3JvdXAgdGhhdCBpcyBnZW5lcmF0ZWQgYnkgYWRqYWNlbnQgdHJhbnNwb3NpdGlvbnMuCj4g Cj4gU28gb25lIHdheSB0byAiZml4IiB0aGUgdGhlb3J5IGNvdWxkIGJlIHRvIGFkZCB0aGF0IGFz IGEgcmVxdWlyZW1lbnQuCj4gRm9ybWFsbHksIGNvbnNpZGVyIHRoZSBtYXAgZnJvbSBwYXRocyB0 byBzZXF1ZW5jZXMgb2YgbmFtZXMuIEZvciBlYWNoCj4gcGFpciAocyx0KSBvZiBjb250ZXh0cywg dGhlIGltYWdlIG9mIHRoZSBzZXQgb2YgcGFyYWxsZWwgcGF0aHMgZnJvbSBzIHRvCj4gdCB1bmRl ciB0aGlzIG1hcCBjYW4gYmUgcmVnYXJkZWQgYXMgYSBzdWJzZXQgb2YgU19OICh3aGVyZSBOIGlz IHRoZQo+IGNvbW1vbiBwYXRoIGxlbmd0aCkuIFRoZSByZXF1aXJlbWVudCBpcyB0aGF0IHRoaXMg aXMgYSBzdWJncm91cAo+IGdlbmVyYXRlZCBieSBhZGphY2VudCB0cmFuc3BvaXNpdGlvbnMuKQoK SSB0aGluayBzb21ldGhpbmcgbGlrZSB0aGF0IHdvdWxkIHdvcmsuIEkgZG9uJ3QgdGhpbmsgZGVz Y3JpYmluZyBpdCBhcwphICJzdWJncm91cCIgd29ya3MgZXhhY3RseS4gRm9yIG9uZSB0aGluZywg dGhlIGVsZW1lbnRzIG9mIHRoZSBzZXQgYXJlCnNlcXVlbmNlcyBvZiBuYW1lcywgd2hpY2ggYXJl IG5vdCB0aGVtc2VsdmVzIHBlcm11dGF0aW9ucy4gWW91IGNvdWxkCnBpY2sgb25lICJjYW5vbmlj YWwiIG9yZGVyaW5nIGFuZCBpZGVudGlmeSBlYWNoIG90aGVyIHNlcXVlbmNlIHdpdGggdGhlCnBl cm11dGF0aW9uIHRoYXQgcmUtb3JkZXJzIHRoZSBjYW5vbmljYWwgb3JkZXJpbmcgaW50byBpdCwg c28gYXQgbGVhc3QKeW91IGhhdmUgYSBzZXQgb2YgcGVybXV0YXRpb25zLCBidXQgSSBkb24ndCBr bm93IGlmIGl0IHdpbGwgYmUgYQpzdWJncm91cC4KCj4gQXQgbGVhc3QgSSAqdGhpbmsqIHRoYXQg d291bGQgZml4IHRoZSB0aGVvcnksIGkuZS4gYWxsb3cgdG8gcHJvdmUgbXkKPiBjb25qZWN0dXJl cyBhYm91dCBtZXJnZXMuIEhvd2V2ZXIsIGl0IGZlZWxzIGEgYml0IGhlYXZ5LXdlaWdodCBhbmQg SQo+IHdvdWxkIHByZWZlciBhIG1vcmUgZWxlZ2FudCB3YXkgdG8gZXhwcmVzcyB0aGlzIHJlcXVp cmVtZW50LgoKSGVyZSBhcmUgdGhyZWUgbW9yZSBhdHRlbXB0cy4gTm90IG5lY2Vzc2FyaWx5IGJl dHRlciB0aGFuIHlvdXJzLCBidXQKbWF5YmUgZm9vZCBmb3IgdGhvdWdodC4KCjEuCgpJIHN1c3Bl Y3QgdGhlIGZvbGxvd2luZyB0d28gcHJvcGVydGllcyB0b2dldGhlciBtYXkgYmUgZXF1aXZhbGVu dCB0bwooYSBmaXhlZC11cCB2ZXJzaW9uIG9mKSB5b3VyIHBlcm11dGF0aW9uLXN1Ymdyb3VwIHBy b3BlcnR5OgoKYSkgbmFtZShwcScpID0gbmFtZShwKSBVIG5hbWUocSkgd2hlbmV2ZXIgcHEnIGlz IGEgY2xlYW4gbWVyZ2Ugb2YgcCBhbmQKICAgcSAoZGVmaW5pbmcgYSBjbGVhbiBtZXJnZSBhcyBh IHB1c2hvdXQsIGFzIGJlZm9yZSkuCgpiKSBSdWxlIG91dCB0aGlzIGRpYWdyYW06Cgo+ID4gICAg ICAgKgo+ID4gICAgIGEvIFxiCj4gPiAgICAgLyAgIFwKPiA+ICAgICogICAgICoKPiA+ICBkL3xj ICBjJ3xcZCcKPiA+ICAvIHwgICAgIHwgXAo+ID4gKiAgKiAgICAgKiAgKgo+ID4gfCAgIFwgICAv ICAgfAo+ID4gfCAgYidcIC9hJyAgfAo+ID4gfCAgICAgKiAgICAgfAo+ID4gIFwgICAgICAgICAv Cj4gPiAgIFwgICAgICAgLwo+ID4gYicnXCAgICAgL2EnJwo+ID4gICAgIFwgICAvCj4gPiAgICAg IFwgLwo+ID4gICAgICAgKgoKYnkgc2F5aW5nIHRoYXQgZm9yIGV2ZXJ5IGNvbW11dGluZyBzcXVh cmUKCiAgICoKIGEvIFxiCiAvICAgXAoqICAgICAqCiBcICAgLwogIFwgLwogICAqCgp0aGUgcHVz aG91dCAoY2xlYW4gbWVyZ2UpIG9mIGEgYW5kIGIgZXhpc3RzLgoKSSBoYXZlbid0IGZ1bGx5IHdv cmtlZCBvdXQgYSBwcm9vZiB0aGF0IChhKSBhbmQgKGIpIGlzIGVxdWl2YWxlbnQgdG8Kc29tZXRo aW5nIGFib3V0IHRyYW5zcG9zaXRpb25zLCBidXQgaXQgc2VlbXMgbGlrZWx5IHRvIGJlIHRydWUu IE1heWJlIEkKc2hvdWxkIHRoaW5rIGFib3V0IGl0IG1vcmUuCgoyLgoKVGhpcyBpcyBhIG1vcmUg cmFkaWNhbCBjaGFuZ2UsIHNvIEknbGwgc3RhcnQgZnJvbSB0aGUgYmVnaW5uaW5nLgoKQSBwYXRj aCB0aGVvcnkgY29uc2lzdHMgb2Y6CgoqIGEgc2V0IE4gb2YgbmFtZXMsIGFuZAoKKiBhIHNldCBD IG9mIHNldHMgb2YgbmFtZXMgKGkuZS4gQyBpcyBhIHN1YnNldCBvZiB0aGUgcG93ZXJzZXQgb2Yg TikKICAoZWxlbWVudHMgb2YgQyBhcmUgY2FsbGVkICJjb250ZXh0cyIpCgpzdWNoIHRoYXQgQyBj b250YWlucyB0aGUgZW1wdHkgc2V0LCBhbmQgZm9yIGFueSBjMSwgYzIsIGMzIGluIEMsIGlmCmMx IOKKhiBjMyBhbmQgYzIg4oqGIGMzLCB0aGVuIGMxIOKIqiBjMiBpcyBhbiBlbGVtZW50IG9mIEMu CgpUaGF0J3MgYWxsLiBCdXQgd2UgbmVlZCB0byBjb25uZWN0IHRoaXMgdG8gbW9yZSBmYW1pbGlh ciB0ZXJtcy4uLgoKSWYgd2UgbGlrZSwgd2UgY2FuIHZpZXcgdGhpcyBhcyBhIGNhdGVnb3J5IHVz aW5nIHRoZSBvcmRlciByZWxhdGlvbiDiioYuClNwZWNpZmljYWxseTogdGhlIG9iamVjdHMgYXJl IGNvbnRleHRzLCBhbmQgdGhlcmUgaXMgYSBzaW5nbGUgbW9ycGhpc20KZnJvbSBjMSB0byBjMiBp ZiBjMSDiioYgYzIsIG90aGVyd2lzZSBub25lLgoKQSAicGF0Y2giIGlzIGp1c3QgYSBtb3JwaGlz bSBiZXR3ZWVuIHR3byBjb250ZXh0cyB0aGF0IGRpZmZlciBieSB0aGUKaW5jbHVzaW9uIG9mIG9u ZSBuYW1lLgoKVGhpcyBpcyBzaW1pbGFyIHRvIHlvdXIgY2F0ZWdvcnkgdmlldy4gVGhlIGRpZmZl cmVuY2UgaXMgdGhhdCBwYXRjaApzZXF1ZW5jZXMgY2FuIG5vIGxvbmdlciByZXByZXNlbnRlZCBh cyBtb3JwaGlzbXMgKHVubGVzcyB5b3UncmUgd2lsbGluZwp0byBmb3JnZXQgdGhlIG9yZGVyKS4g T2YgY291cnNlIHRoaXMgZG9lc24ndCBwcmV2ZW50IHVzIGZyb20gdGFsa2luZwphYm91dCBwYXRj aCBzZXF1ZW5jZXMuCgozLgoKIzMgaXMganVzdCBhIHJlcGhyYXNpbmcgb2YgMiB0byBiZSBtb3Jl IGNvbXBhdGlibGUgd2l0aCB5b3VyCmNhdGVnb3JpY2FsIHBvaW50IG9mIHZpZXcuCgpEZWZpbmUg TiBhbmQgQyBhcyBpbiAyIGFib3ZlIChpbmNsdWRpbmcgdGhlIHJlcXVpcmVtZW50cyBJIGltcG9z ZWQgb24KQykuCgpEZWZpbmUgYSBncmFwaCBHIGFzIGZvbGxvd3MuIFRoZSBub2RlcyBhcmUgYWxs IGVsZW1lbnRzIG9mIEMuIFRoZSBlZGdlcwphcmUgYWxsIHBhaXJzIChjMSwgYzIpIHdoZXJlIGMy IGFuZCBjMSBkaWZmZXIgYnkgdGhlIGluY2x1c2lvbiBvZiBvbmUKbmFtZSAoYzIgPSBjMSDiiKog e259KTsgdGhlIGVkZ2UgaXMgbGFiZWxsZWQgYnkgdGhhdCBuYW1lIG4uCgpEZWZpbmUgdGhlIGZy ZWUgY2F0ZWdvcnkgb24gRyBhcyBpbiB5b3VyIG9yaWdpbmFsIGZvcm11bGF0aW9uLiBOb3RlCnRo YXQgdGhlIG5hbWUgb2YgYW55IHBhdGggd2lsbCBqdXN0IGJlIHRoZSBzZXQgZGlmZmVyZW5jZSBv ZiBpdHMKZW5kcG9pbnRzLCBzbyB5b3VyIHJlcXVpcmVtZW50IHRoYXQgcGFyYWxsZWwgcGF0aHMg aGF2ZSB0aGUgc2FtZSBuYW1lCmlzIHNhdGlzZmllZC4gVGhlIGFkZGl0aW9uYWwgcmVxdWlyZW1l bnRzIG9uIHRoZSBzZXQgQyAodGFrZW4gZnJvbSAjMikKd2lsbCBob3BlZnVsbHkgZW5zdXJlIHRo YXQgY2xlYW4gbWVyZ2VzIGJlaGF2ZSB3ZWxsLgoKLS0gCkphbWVzCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRhcmNzLXVzZXJzIG1haWxpbmcgbGlzdApk YXJjcy11c2Vyc0Bvc3Vvc2wub3JnCmh0dHBzOi8vbGlzdHMub3N1b3NsLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2RhcmNzLXVzZXJzCg==