Parents and children of check-in [bbfa0715f0]
|
2026-07-18
| ||
| 02:53 |
Merge merge-verb: the zit merge command (three-way merge + two-token P card)
Completes the checkout-and-history CLI slice — merge is the sixth and final verb (after timeline, mv, undo/redo, extras, clean). Line-based three-way merge into the working tree with fossil-style conflict markers, a mtime-independent up-to-date/ancestry gate, and a commit that mints the primary-first two-token P card and refuses while any marker remains. 1629 unit + 307 e2e green; dst 6x1000. check-in: c2c837c5e1 user: dmestas tags: trunk | |
| 01:22 | Create new branch named "merge-verb" check-in: 8404f79a7b user: dmestas tags: merge-verb | |
| 00:52 |
Merge next-verbs-2: extras and clean
Two untracked-file management verbs over one shared control-name/sweep module (artifact §8 never-tracked superset; the .zit control files and derived sidecars are the exclusion set): - extras: list files present in the working tree but not in the managed set and not control/derived files — the untracked surface, one path per line. - clean: remove those extras from the working tree, refusing to touch any tracked or control file; the sweep propagates allocation failure without leaking and never crashes on a hostile tree (fuzzed). Slice tail: merge remains unshipped (its plan/implement agent repeatedly lost its API connection mid-response this session). Full unit + e2e (290/290) green on the merged trunk. check-in: bbfa0715f0 user: dmestas tags: trunk | |
| 00:15 | Add the extras and clean commands over one shared untracked-file sweep: extras lists every checkout file zit is not tracking, and clean deletes exactly that set behind a --force gate, otherwise refusing non-interactively with a count because the deletion is irreversible and outside undo's shelter, per B-extras and B-clean-1/-5/-18. closed check-in: 7367551a07 user: dmestas tags: next-verbs-2 | |
|
2026-07-17
| ||
| 22:08 |
Merge next-verbs: timeline, mv, and undo/redo
Three checkout-and-history CLI verbs, each built to its B-verb contract and RFC oracle, each gated green (unit + e2e) before commit: - timeline: list every check-in newest-first by event.mtime with an ascending full-hash tiebreak (repo-state §2, §8.3 item 7), merge check-ins marked M (§3.2), each on its branch with the configured main-branch fallback (§6.1/§6.4). - mv OLD NEW: rename a tracked file, moving it on disk and swapping the managed entry atomically; refuses (exit 1) an untracked OLD, an existing/tracked NEW, or a self-move; the rename records a one-shot NEW three-token on the next commit. - undo / redo: journal each sheltered mutation's pre-image (fsynced before the mutation) so update/revert are reversible; a corrupt or empty journal is a clean exit 1 with no partial restore. Slice partial: extras, clean, and merge were not completed this run. Full unit + e2e green on the merged trunk. check-in: 89ef496c3b user: dmestas tags: trunk | |