Overview
| Comment: | Merge trunk into cli to bring the recovered tree onto the branch: the correctness and RFC-alignment fixes, the sibling test-file layout, and the Ousterhout de-duplication, so follow-on verb and coverage work builds on the integrated state. |
|---|---|
| Timelines: | family | ancestors | descendants | both | cli |
| Files: | files | file ages | folders |
| SHA3-256: |
2ce67c9598e45cd5b58d59a6d6b4c560 |
| User & Date: | dmestas on 2026-07-14 02:18:28.796 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-07-14
| ||
| 10:01 | Merge trunk into cli: the uvfile payload bit-gating fix (sync §7.3), so verb work builds on the current integrated state. check-in: 98a0f2c85c user: dmestas tags: cli | |
| 02:18 | Merge trunk into cli to bring the recovered tree onto the branch: the correctness and RFC-alignment fixes, the sibling test-file layout, and the Ousterhout de-duplication, so follow-on verb and coverage work builds on the integrated state. check-in: 2ce67c9598 user: dmestas tags: cli | |
| 02:13 | Drop two tautological assertions in the push-intent and inbound-gimme predicates: each merely restates the boolean defined on the line directly above it and so can never fail, leaving them as noise rather than a check of any invariant a bug could violate. check-in: eea9f66041 user: dmestas tags: trunk | |
|
2026-07-13
| ||
| 18:41 | Merge trunk into the CLI branch to track the integrated tip for follow-on work check-in: bf454fa2ee user: dmestas tags: cli | |
Changes
Modified build.zig
from [ba19808d1e]
to [37cff91cb6].
[diff]
Modified src/artifact.zig
from [1ebfb3ab43]
to [02c9a09b8a].
[diff]
Modified src/artifact_test.zig
from [0e0208b5e9]
to [f5eeb39b2d].
[diff]
Modified src/checkout.zig
from [6ece1fad83]
to [d77c2a4e6b].
[diff]
Modified src/cli.zig
from [7d4fd6d18f]
to [5ca16d20e3].
[diff]
Modified src/e2e.zig
from [19c3ebeeca]
to [4461efc223].
[diff]
Modified src/logstore.zig
from [3a1970c2b0]
to [471bc0c518].
[diff]
Modified src/logstore_test.zig
from [c832804daa]
to [fa48c03609].
[diff]
Modified src/main.zig
from [43c93e7254]
to [c0fd5628bc].
[diff]
Modified src/repostate.zig
from [f43e4f2b48]
to [6926360fb0].
[diff]
Modified src/repostate_test.zig
from [93b312d69c]
to [27963d56e1].
[diff]
Modified src/sim/faulty_file.zig
from [5b53ce4b3c]
to [ba6f4a4872].
[diff]
Modified src/storage.zig
from [017a2f3240]
to [512205eb62].
[diff]
Modified src/sync.zig
from [453dfa2b3f]
to [bad0877e42].
[diff]
Modified src/sync_test.zig
from [8955a605e8]
to [d692272b09].
[diff]
Modified src/update.zig
from [77f6ab6754]
to [6936029d7e].
[diff]
Modified src/update_test.zig
from [2ea6a07f68]
to [e5addd0dfa].
[diff]