Overview
| Comment: | Horizon sweep: a generated merge that conflicts after criss-cross merges keeps the owner's later version |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
3d46cafc30cb96c5e08df4962774f1d9 |
| User & Date: | dmestas on 2026-10-28 21:52:17.816 |
| Other Links: | manifest | tags |
Context
|
2026-10-28
| ||
| 21:52 | import-git writes the published store in one pass: blobs wait for the commit that names their path, tree nodes delta against the node they replace, mirror candidates go to a side store, and the verifier checks a name tally instead of a raw generation check-in: 3842bce3fc user: dmestas tags: trunk | |
| 21:52 | Horizon sweep: a generated merge that conflicts after criss-cross merges keeps the owner's later version check-in: 3d46cafc30 user: dmestas tags: trunk | |
| 19:20 | import-git: verify reconstructs only the drop set from the raw generation, and pack leaves the published sweep to the verifier check-in: 304f89d989 user: dmestas tags: trunk | |
Changes
Modified src/sim/horizon_sweep.zig
from [59283a613b]
to [5684a6cf37].
[diff]