Artifact 3cb9c2e5b0eae1155b0354547dc34aebc8add662bb4975b62b6f5976bb476d58:
- File
internal/merge/ancestor.go
-
2026-10-22 20:37:14
— part of check-in
[89c6ae4aa6]
on branch feat/horizon-cones
— fix(merge): read the pivot seed's mtime as a number under every driver
The ncruces driver reads event.mtime, declared DATETIME, as a time.Time, so the pivot search failed to scan its seed under -tags test_ncruces. coalesce() drops the declared type, as the parent query's already did. (user: [email protected], size: 10073) [annotate] [blame] [check-ins using]
-
2026-10-22 20:37:44
— part of check-in
[97e188b6ef]
on branch feat/horizon-cones
— Merge branch 'wip/merge-pivot' into feat/horizon-cones
Merge bases chosen as fossil's pivot_find chooses them: the most recent common ancestor by check-in time, with the check-out's pending merges as further secondaries, in place of a bidirectional breadth-first search that picked a different base on criss-cross and skewed histories. Checked against fossil 2.28 on 114 queries and a byte-for-byte merge. (user: [email protected], size: 10073) [annotate] [blame] [check-ins using]
-
2026-10-22 20:37:14
— part of check-in
[89c6ae4aa6]
on branch feat/horizon-cones
— fix(merge): read the pivot seed's mtime as a number under every driver