Overview
| Comment: | Merge commit '8961b59' into feat/sparse-store |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
dd6f1125eda2759c7f62d2c524e81aea |
| User & Date: | [email protected] on 2026-10-20 15:58:34.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-20
| ||
| 16:01 | Merge main release fixes while preserving feature ticket coverage check-in: 67c2af8525 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 15:58 | Merge commit '8961b59' into feat/sparse-store check-in: dd6f1125ed user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 03:01 |
Merge remote-tracking branch 'origin/main' into feat/submanifest-reader
# Conflicts: # internal/checkout/vfile.go check-in: 741864259c user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 02:48 | fix(checkout): restore the database/sql import the merge dropped check-in: ab7f1cde7b user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [0079f59404]
to [af8fb5c458].
[diff]
Added cli/pathmatch.go version [2376228a89].
Modified cli/repo_cat.go
from [c0a4d76b12]
to [280aacaee4].
[diff]
Modified cli/repo_diff.go
from [1b511b35fc]
to [8189cd9e1f].
[diff]
Modified cli/repo_log.go
from [f8892069bf]
to [c997222efc].
[diff]
Modified cli/repo_new.go
from [3696eb11ee]
to [5591e173c1].
[diff]
Added cmd/libfossil/pathmatch_test.go version [eb8630fdd5].
Added cmd/libfossil/repo_new_test.go version [7a929719b2].
Modified db/db.go
from [231e1830d5]
to [e0fdea9033].
[diff]
Modified db/db_test.go
from [9b7c389d98]
to [f5a983f1f0].
[diff]
Modified docs/site/content/docs/cli-embedding.md
from [b12a74b7c0]
to [b1eedec5b5].
[diff]
Modified fossil.go
from [3d8331ff79]
to [8e388bccf7].
[diff]
Modified internal/manifest/finfo.go
from [417feec34d]
to [c8fccb56b4].
[diff]
Added internal/repo/filename_case_test.go version [1ab583f6a5].
Added internal/repo/setting.go version [3858ed8a65].
Added internal/repo/setting_test.go version [1a8dd573c7].
Modified internal/sync/ckin_lock.go
from [cd39166409]
to [bc90713cd6].
[diff]
Modified internal/sync/ckin_lock_test.go
from [87ff97908a]
to [aeb229aa07].
[diff]
Modified internal/vfile/disk.go
from [d485f17e71]
to [03e67c983c].
[diff]