Artifact 64c54aba6408fdac31c89728486b490b0d17a3ef06ac648441245e7bd5842ba5:
- File
www/reference.html
— part of check-in
[8951bc9d1e]
at
2026-08-23 20:45:11
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: 109757) [annotate] [blame] [check-ins using] [more...]