Artifact c6542f8ef90a699d3d9eeb9e8ed0dc84101c0f67186b7513c36edade4d6a8ff0:
- File
internal/checkout/update.go
-
2026-10-21 11:24:19
— part of check-in
[5a070508db]
on branch feat/submanifest-reader
— fix(checkout): keep a pending merge across a sparse update
Fossil's update leaves vmerge alone, so the next commit records the merge parent. The sparse update cleared vmerge, losing the parent and letting a partial commit through while the merge was still pending. (user: [email protected], size: 30184) [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: 30184) [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: 30184) [annotate] [blame] [check-ins using]
-
2026-10-21 11:24:19
— part of check-in
[5a070508db]
on branch feat/submanifest-reader
— fix(checkout): keep a pending merge across a sparse update