Artifact 611adef62736857f46a2e3331f9bcddef33ad96fa310951a2002fff4b0481af0:
- File
src/main.zig
-
2026-08-23 20:45:11
— part of check-in
[8951bc9d1e]
on branch landing-bare-store
— landing: accept against a bare store, refusing conflicts
accept -R merges in a working area it creates and removes, materializing only the files both sides changed -- sparse-cone 4.4 resolves the rest into the record without writing them. The check-in is minted by the same commit path a checkout uses, so its F, P and R cards match a dense merge exactly.
A landing that does not merge cleanly exits 5 with the store byte-unchanged and each conflicting path named. A forge never holds a half-finished merge and never commits conflict markers; the author resolves it from their own checkout.
runMergeIn/runCommitIn take the checkout as a parameter instead of reading the process's cwd, which is what makes an ephemeral tree addressable without mutating global state. (user: dmestas, size: 224619) [annotate] [blame] [check-ins using]
-
2026-08-23 20:55:16
— part of check-in
[d2bbc4f459]
on branch trunk
— merge landing-bare-store: mergeability probe and bare-store accept
zit landing show reports whether a branch would land cleanly, read from the store without writing anything. zit landing accept -R lands one with no checkout, merging in a working area it creates and removes, and refuses a conflicting landing with exit 5 and nothing written. (user: dmestas, size: 224619) [annotate] [blame] [check-ins using]
-
2026-08-23 20:45:11
— part of check-in
[8951bc9d1e]
on branch landing-bare-store
— landing: accept against a bare store, refusing conflicts