Overview
| Comment: | Merge branch 'feat/submanifest-reader' into feat/sparse-store |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
e4f56e44a9263d45bd5fa75313154f1f |
| User & Date: | [email protected] on 2026-10-20 02:45:47.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-20
| ||
| 02:48 | fix(checkout): restore the database/sql import the merge dropped check-in: ab7f1cde7b user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 02:45 | Merge branch 'feat/submanifest-reader' into feat/sparse-store check-in: e4f56e44a9 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 02:40 |
Merge branch 'fix/revert-swap-chain' into feat/submanifest-reader
# Conflicts: # internal/checkout/revert.go check-in: 32155296d0 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 00:25 | docs(changelog): sparse store classification and verification check-in: 242b5f3d9e user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [4a2af5ba48]
to [0079f59404].
[diff]
Modified checkout.go
from [f8e535f29e]
to [5e7c7b6cea].
[diff]
Added checkout_revert_renames_interop_test.go version [c1f43438a6].
Added cli/exit.go version [a4a4949165].
Added cli/json.go version [dd120069d5].
Modified cli/repo.go
from [743d845aa8]
to [1bc8b1288c].
[diff]
Modified cli/repo_cat.go
from [a2ded7d866]
to [c0a4d76b12].
[diff]
Modified cli/repo_diff.go
from [7179c1d7b6]
to [1b511b35fc].
[diff]
Added cli/repo_log.go version [f8892069bf].
Added cli/repo_snapshot.go version [37d1544122].
Modified cli/repo_stage_test.go
from [4a84b6b406]
to [b99ec6041c].
[diff]
Modified cmd/libfossil/main.go
from [57c8d60a54]
to [ecd2eff17c].
[diff]
Added cmd/libfossil/snapshot_test.go version [6f28195cdd].
Modified conformance/artifact_api_test.go
from [e494d9683d]
to [dd98e766eb].
[diff]
Modified conformance/artifact_delta_test.go
from [3386b7d65c]
to [88dae3d892].
[diff]
Modified conformance/artifact_test.go
from [1d9abe9151]
to [546c23bca4].
[diff]
Modified conformance/coverage_test.go
from [3745a0911f]
to [5ff801132e].
[diff]
Modified conformance/doc.go
from [38b65381a9]
to [d005ce82b4].
[diff]
Modified conformance/harness_self_test.go
from [c72caf3d56]
to [8ad0554c50].
[diff]
Modified conformance/repostate_date_test.go
from [a3ce93fc14]
to [5d0bd1f71b].
[diff]
Modified conformance/repostate_eventtags_test.go
from [8dca44317c]
to [f233528f80].
[diff]
Modified conformance/repostate_test.go
from [32ac9b7c16]
to [71c55a1411].
[diff]
Modified conformance/requirements/artifact.tsv
from [26b231dee0]
to [ddd067744d].
[diff]
Modified conformance/requirements/repostate.tsv
from [2098bf3397]
to [223dc1f32d].
[diff]
Modified conformance/requirements/sparse-cone.tsv
from [c38da5b1cf]
to [d6925c8200].
[diff]
Modified conformance/requirements/submanifest.tsv
from [857adbefa7]
to [d594252b95].
[diff]
Modified conformance/requirements/sync.tsv
from [7e014d5fb4]
to [0a0a3dadd9].
[diff]
Modified conformance/rfcs/README.md
from [a90c2edeec]
to [6b364a0b56].
[diff]
Added conformance/rfcs/draft-fossil-artifact-format-00.txt version [aa13f2e42c].
Deleted conformance/rfcs/draft-fossil-artifact-format-01.txt version [b92b19b71f].
Added conformance/rfcs/draft-fossil-repo-state-00.txt version [140fdf2d3b].
Deleted conformance/rfcs/draft-fossil-repo-state-01.txt version [9980e22265].
Modified conformance/rfcs/draft-fossil-sparse-cone-00.txt
from [cc2c259c19]
to [05f8b59810].
[diff]
Modified conformance/rfcs/draft-fossil-submanifests-00.txt
from [22c3592cdd]
to [5379bc614e].
[diff]
Added conformance/rfcs/draft-fossil-sync-protocol-00.txt version [62e9495f35].
Deleted conformance/rfcs/draft-fossil-sync-protocol-01.txt version [bafc21adc5].
Deleted conformance/rfcs/erratum/artifact-format-01-s4.4-z-card-last-by-ordering.md version [dc53e482e1].
Deleted conformance/rfcs/erratum/artifact-format-01-s4.6.4-julian-day-grammar.md version [5a1adf7f9c].
Deleted conformance/rfcs/erratum/artifact-format-01-s4.7.3-delta-of-delta-delete-markers.md version [fbc5c735d8].
Deleted conformance/rfcs/erratum/artifact-format-01-s4.7.8-j-card-empty-value.md version [befe7488ef].
Deleted conformance/rfcs/erratum/repo-state-01-s5.3-inherited-row-blocks-direct-tag.md version [1ee5e540ce].
Deleted conformance/rfcs/erratum/repo-state-01-s6.2-cancel-cards-from-parent.md version [43f021a207].
Deleted conformance/rfcs/erratum/repo-state-01-s6.2-self-cancelling-sym-tag.md version [821dd715d9].
Deleted conformance/rfcs/erratum/repo-state-01-s7.3-leaf-recheck-branch-tag.md version [275509b8fc].
Deleted conformance/rfcs/erratum/repo-state-01-s8.3-ckout-ci-plus.md version [7e8ecce19e].
Deleted conformance/rfcs/erratum/sync-protocol-01-s10.1-wrong-hash-file-fails-the-round.md version [e5dd8a4c9b].
Deleted conformance/rfcs/erratum/sync-protocol-01-s5.1-truncated-payload-receiver.md version [8157e3faaf].
Deleted conformance/rfcs/erratum/sync-protocol-01-s6.6-file-card-after-refused-push.md version [1c50fe8add].
Deleted conformance/rfcs/erratum/sync-protocol-01-s9.4-avoid-delta-manifests.md version [e29beb0afc].
Modified conformance/sparsecone_test.go
from [4f1f503e99]
to [80078acd01].
[diff]
Modified conformance/sync_order_test.go
from [cd2d2936c8]
to [959b91ff34].
[diff]
Modified conformance/sync_refusal_test.go
from [bc63f1a6aa]
to [7e915eb4b2].
[diff]
Modified conformance/sync_test.go
from [47fea0a164]
to [23cdabea35].
[diff]
Modified db/db.go
from [dbdd80ed14]
to [231e1830d5].
[diff]
Modified db/db_test.go
from [04f7057d7a]
to [9b7c389d98].
[diff]
Modified db/scan.go
from [5f75119881]
to [9f570f418b].
[diff]
Modified db/scan_test.go
from [4d9310b7e9]
to [d6da854b83].
[diff]
Added db/scantime_test.go version [a7c9ab43bf].
Added docs/site/content/docs/cli-embedding.md version [b12a74b7c0].
Modified docs/site/content/docs/migration-from-fossil.md
from [57bbd2bc8d]
to [506f670974].
[diff]
Modified docs/site/content/docs/reference/sdk/libfossil/api.md
from [948f11ed4b]
to [97aae38d01].
[diff]
Modified integration_cli_test.go
from [f18c6b7929]
to [d49ecb82ca].
[diff]
Modified internal/annotate/annotate.go
from [d1cbede32a]
to [6ef1dbb2bd].
[diff]
Modified internal/checkout/checkin.go
from [ccca6129f6]
to [c652a2ceaf].
[diff]
Modified internal/checkout/extract.go
from [0bd58c1255]
to [5ce8b2f818].
[diff]
Modified internal/checkout/fork.go
from [945617fde0]
to [35e0b4bb04].
[diff]
Modified internal/checkout/fork_test.go
from [6928a8ab10]
to [a1295be27a].
[diff]
Modified internal/checkout/merge.go
from [467423514f]
to [3ad692c800].
[diff]
Modified internal/checkout/perm.go
from [a553711d3b]
to [4f99e101f0].
[diff]
Modified internal/checkout/perm_unix_test.go
from [2f27efce99]
to [8679fcea46].
[diff]
Modified internal/checkout/revert.go
from [e8dc9c13d8]
to [e85b97fa43].
[diff]
Added internal/checkout/revert_undo.go version [d34d33fc95].
Added internal/checkout/revert_undo_js.go version [b9343919d4].
Modified internal/checkout/status.go
from [34321b4814]
to [ae2bf19898].
[diff]
Added internal/checkout/symlink_writes_fossilbin_test.go version [628b9a97ac].
Added internal/checkout/symlink_writes_unix_test.go version [b49005ba67].
Modified internal/checkout/undo.go
from [5a29ca30ff]
to [cb06305bc7].
[diff]
Modified internal/checkout/update.go
from [0a5b4fdaef]
to [44b5a6be98].
[diff]
Modified internal/checkout/update_target.go
from [eec973920b]
to [a07aa4f9ff].
[diff]
Modified internal/checkout/update_undo.go
from [e20f5cbe51]
to [9ba3a9315f].
[diff]
Modified internal/checkout/vfile.go
from [f0082b615e]
to [b4e05fc814].
[diff]
Modified internal/cone/cone.go
from [04e1e10503]
to [5952203405].
[diff]
Modified internal/content/content.go
from [44c2ffe0ad]
to [ae64f5dd7a].
[diff]
Modified internal/deck/marshal.go
from [2f417b7e99]
to [8d44cabd67].
[diff]
Modified internal/deck/parse.go
from [89005aabc5]
to [1c8c38fedc].
[diff]
Modified internal/deck/pathname.go
from [1106d3b6c3]
to [641c91e815].
[diff]
Modified internal/deck/submanifest_test.go
from [7a6713d2e8]
to [c9944c25ea].
[diff]
Modified internal/deck/timestamp.go
from [4ab2df7a74]
to [a3da4926d5].
[diff]
Modified internal/fsltype/fsltype.go
from [11a7b2788f]
to [61c0c360ba].
[diff]
Modified internal/fsltype/julian.go
from [373321440a]
to [574ba5d3f8].
[diff]
Modified internal/fsltype/julian_test.go
from [6189623f51]
to [7374b749e6].
[diff]
Modified internal/hash/policy.go
from [7026914eb2]
to [418ed0a8c4].
[diff]
Modified internal/hash/policy_test.go
from [90619bc762]
to [376df72f20].
[diff]
Modified internal/leaf/leaf.go
from [3a4ed8cc9e]
to [e871143501].
[diff]
Modified internal/manifest/crosslink.go
from [4e1d71efff]
to [0720a03615].
[diff]
Modified internal/manifest/crosslink_leaf_test.go
from [f185fe1d32]
to [bf2b632434].
[diff]
Modified internal/manifest/files.go
from [8b86357e63]
to [1e08269634].
[diff]
Modified internal/manifest/finfo.go
from [37df8b55a3]
to [417feec34d].
[diff]
Modified internal/manifest/finfo_test.go
from [e2ee9c8d6e]
to [5048b32680].
[diff]
Modified internal/manifest/manifest.go
from [aae1bb87a6]
to [abee2234a5].
[diff]
Modified internal/manifest/manifest_test.go
from [0e0e9e6dc4]
to [230f1a275c].
[diff]
Modified internal/manifest/reparent.go
from [dcf9eee1be]
to [b0ce1eb99d].
[diff]
Modified internal/manifest/reparent_test.go
from [0cdad78856]
to [273966db46].
[diff]
Modified internal/repo/hash_policy_test.go
from [0b14c50eb2]
to [5d8aea5545].
[diff]
Modified internal/repo/mainbranch.go
from [93c3d645f4]
to [24bf9ba121].
[diff]
Modified internal/repo/repo.go
from [257e88af1b]
to [7e1fc4982e].
[diff]
Modified internal/stash/fossilbin_test.go
from [bcf645ccf9]
to [9108bf39a5].
[diff]
Modified internal/stash/stash.go
from [602cda036a]
to [3f381d94e1].
[diff]
Modified internal/stash/stash_test.go
from [7d2e257281]
to [900a60d82d].
[diff]
Modified internal/stash/storage_test.go
from [b6069cf662]
to [30c7ba8ffa].
[diff]
Added internal/stash/symlink_unix_test.go version [41b3c2b983].
Modified internal/sync/clone.go
from [5156cb365d]
to [b00be5279b].
[diff]
Modified internal/sync/handler.go
from [d60167a618]
to [037145e956].
[diff]
Modified internal/sync/pull_leaf_test.go
from [ba34642ecf]
to [9e88b9eadf].
[diff]
Modified internal/sync/session.go
from [2c9624923f]
to [3839296307].
[diff]
Modified internal/tag/propagate.go
from [3cdb59fcf0]
to [19ee21cf7b].
[diff]
Modified internal/tag/tag.go
from [4abc0a308e]
to [7c0a63d4e2].
[diff]
Modified internal/tag/tag_date_test.go
from [ae14364e79]
to [49bf6ce98b].
[diff]
Modified internal/tag/tag_leaf_test.go
from [04251007ab]
to [b6716e4a87].
[diff]
Modified internal/undo/fossilbin_test.go
from [bd87a59ea9]
to [8a5aa92e34].
[diff]
Modified internal/undo/storage_test.go
from [c8c1def66e]
to [fe049e6eec].
[diff]
Added internal/undo/symlink_unix_test.go version [aea46ccf5f].
Modified internal/undo/undo.go
from [42b035facc]
to [b84ad96136].
[diff]
Modified internal/undo/undo_test.go
from [5a1be7db18]
to [cc12481f5f].
[diff]
Modified internal/uv/uv.go
from [f84a84ba4f]
to [2c88fda48a].
[diff]
Modified internal/uv/uv_test.go
from [c67698d576]
to [26efdc7160].
[diff]
Modified internal/verify/verify_test.go
from [ba61fea6f9]
to [d4927f5ce6].
[diff]
Added internal/vfile/disk.go version [d485f17e71].
Added internal/vfile/disk_test.go version [a992bd145c].
Modified internal/xfer/card.go
from [0c6c9fca2c]
to [5a4d6cf421].
[diff]
Modified internal/xfer/codec_test.go
from [9c39b0864e]
to [30f53f7f00].
[diff]
Modified internal/xfer/decode.go
from [4a1e63306c]
to [8420288975].
[diff]
Modified internal/xfer/uvname_test.go
from [3b1ac27931]
to [30fad618a2].
[diff]
Modified repo_hash_policy_test.go
from [e1c55825eb]
to [ac207048e3].
[diff]
Modified repo_history.go
from [5fad63c59e]
to [693e43ecc7].
[diff]
Modified repo_merge.go
from [a954c04529]
to [f55149bec1].
[diff]
Modified scripts/refresh-conformance-rfcs.sh
from [a8603cf455]
to [72adcde2b0].
[diff]