Artifact cbcd8f22e0893aea13d6091bd31f94969e797f22d4e8f474896537067557bcd2:
- File
internal/checkout/merge.go
-
2026-10-21 11:29:11
— part of check-in
[dac73e55c9]
on branch feat/submanifest-reader
— refactor(checkout): drop the unreachable record-only merge payload path
Record-only merge steps return before the content switch, and a both-changed path outside the cone is refused, so storeMergePayload had no production caller. Its tests called it directly; they go with it, and the merge-failure test keeps its vmerge assertion. (user: [email protected], size: 28590) [annotate] [blame] [check-ins using]
- 2026-10-21 11:30:48 — part of check-in [ac542fa1de] on branch feat/submanifest-reader — Merge branch 'fix/sparse-update-vmerge' into feat/sparse-consolidated (user: [email protected], size: 28590) [annotate] [blame] [check-ins using]
-
2026-10-21 21:20:46
— part of check-in
[7244496a09]
on branch main
— Merge pull request #437 from danmestas/feat/submanifest-reader
feat: sub-manifest trees and sparse cones (draft-fossil-submanifests-00, draft-fossil-sparse-cone-00) (user: [email protected], size: 28590) [annotate] [blame] [check-ins using]
-
2026-10-21 11:29:11
— part of check-in
[dac73e55c9]
on branch feat/submanifest-reader
— refactor(checkout): drop the unreachable record-only merge payload path