Overview
| Comment: | merge trunk |
|---|---|
| Timelines: | family | ancestors | descendants | both | sparse-cone |
| Files: | files | file ages | folders |
| SHA3-256: |
8b3d577ec19f2bf41c9a40019be51365 |
| User & Date: | dmestas on 2026-08-14 20:17:49.396 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-08-14
| ||
| 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 | |
| 20:02 | zit cone verb: show/add/remove drive the update --cone path, so add fetches and remove dematerializes; member cap to 255 (the count byte's range, spec 3.2 bounds sentence added); spec gains exclusions (cone-not pragma, last-match-wins) and the patterns-deliberately-absent rationale check-in: 2cd32f8a38 user: dmestas tags: sparse-cone | |
| 19:39 | sync: unversioned cards tolerate-and-report (#58) — validated, counted, never an abort; sessions report N not transferred; NotImplemented retired; uv-only replies are the clean §3.7 terminal check-in: 3cf76b982e user: dmestas tags: trunk | |
Changes
Modified .github/workflows/ci.yml
from [1323874755]
to [dc63d72297].
[diff]
Modified README.md
from [9945e68bd0]
to [7799b87ebd].
[diff]
Modified src/cmd/sync.zig
from [6486be4ded]
to [d4f50d5aab].
[diff]
Modified src/git/git_import_cli.zig
from [3f3f918fcf]
to [7cf933cd36].
[diff]
Modified src/sim/sync_sweep.zig
from [be94610d57]
to [de9078e8ee].
[diff]
Modified src/sync.zig
from [d3bc9ea68c]
to [40ae3ea885].
[diff]
Modified src/sync_benchmark.zig
from [057b1475fa]
to [b0aac98d9c].
[diff]
Modified src/sync_driver.zig
from [0d09f30e18]
to [e2cc383662].
[diff]
Modified src/sync_test.zig
from [981954cdae]
to [fa205394f7].
[diff]