Artifact 2925f468610c73101accc367c01b63e8eae9d52d457ad4423d9a4b553c4f87e7:
- File
internal/merge/text.go
-
2026-10-19 01:52:19
— part of check-in
[eb1791acd5]
on branch feat/submanifest-reader
— fix(merge): IsText converts as fossil's text_diff does
Read data through the ported BOM/UTF-16 conversion and line splitter, so the Update gate and the merge agree on what is text.
Tracked in #447 (user: [email protected], size: 641) [annotate] [blame] [check-ins using]
-
2026-10-19 12:46:37
— part of check-in
[2a0701c7d3]
on branch feat/submanifest-reader
— Merge branch 'fix/merge3-markers' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md (user: [email protected], size: 641) [annotate] [blame] [check-ins using]
-
2026-10-19 14:41:42
— part of check-in
[47f89f0798]
on branch feat/submanifest-reader
— Merge branch 'feat/submanifest-reader' into feat/cones
Update's rewrite meets the sparse worktree: a file outside the cone is a record-only step, counted in OutOfCone, and never planned, scanned, checked, written, backed up as NAME-original or chmodded; reloading vfile moves its record to the target. SetCone records the mtime of each file it materializes, as Extract now does. (user: [email protected], size: 641) [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: 641) [annotate] [blame] [check-ins using]
-
2026-10-19 01:52:19
— part of check-in
[eb1791acd5]
on branch feat/submanifest-reader
— fix(merge): IsText converts as fossil's text_diff does