Overview
| Comment: | cross-cone merge applies to the record (spec 4.4): out-of-cone paths resolve at hash level with no blob reads, theirs-only changes ride a merge_overlay container section (v4) in the pending-merge splice, commit composes and clears it one-shot, and only both-changed conflicts refuse — naming the path and the widen remedy |
|---|---|
| Timelines: | family | ancestors | descendants | both | sparse-cone |
| Files: | files | file ages | folders |
| SHA3-256: |
de5e6d9dc0147c1c5e2c537fd6a86db4 |
| User & Date: | dmestas on 2026-08-14 21:16:37.175 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-08-14
| ||
| 21:37 | clone/open/update: --cone-file=FILE reads cone members from a file (one per line, # comments); clone help gains the missing --cone entry check-in: 9191baea4b user: dmestas tags: sparse-cone | |
| 21:16 | cross-cone merge applies to the record (spec 4.4): out-of-cone paths resolve at hash level with no blob reads, theirs-only changes ride a merge_overlay container section (v4) in the pending-merge splice, commit composes and clears it one-shot, and only both-changed conflicts refuse — naming the path and the widen remedy check-in: de5e6d9dc0 user: dmestas tags: sparse-cone | |
| 20:17 | merge trunk check-in: 8b3d577ec1 user: dmestas tags: sparse-cone | |
Changes
Modified src/checkout.zig
from [2450656ab6]
to [455ef2ddff].
[diff]
Modified src/cmd/checkout.zig
from [9e4ce69d91]
to [1aa1eb93a1].
[diff]
Modified src/e2e.zig
from [cd1af770d4]
to [5f20acf74c].
[diff]
Modified src/update.zig
from [1e744ed005]
to [c13585b446].
[diff]