Overview
| Comment: | Merge branch 'feat/cones' into feat/submanifest-reader |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
1a17a3defeb9715ec3f6e8f9d857fb72 |
| User & Date: | [email protected] on 2026-10-19 18:29:33.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 18:34 |
fix(checkout): materialize a symlink entering the cone as a symlink
The cones merge called extractSingleFile without the islink argument the symlink fix added, so it did not build. SetCone now passes the row's islink, and a file entering the cone is written as Extract writes it: a symlink with allow-symlinks on. check-in: 36fccc1f87 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 18:29 | Merge branch 'feat/cones' into feat/submanifest-reader check-in: 1a17a3defe user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 18:29 |
Merge branch 'fix/scan-symlink-extract' into feat/submanifest-reader
# Conflicts: # internal/checkout/update.go check-in: 6708292b55 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 16:51 |
Merge branch 'feat/submanifest-reader' into feat/cones
Update now follows the target's renames and saves undo state. A file outside the cone stays a record-only step: never written, chmodded, backed up or read for undo. A local edit that a rename would carry out of the cone is refused, naming the cone. check-in: 74aa290eda user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [9374a810ba]
to [206010b165].
[diff]
Modified checkout.go
from [39ce8047ec]
to [f8e535f29e].
[diff]
Added checkout_sparse.go version [6e84f800ba].
Added checkout_sparse_fossil_interop_test.go version [a0759909f5].
Added checkout_sparse_test.go version [e34335ce5e].
Modified cli/repo.go
from [2468fde9ae]
to [743d845aa8].
[diff]
Added cli/repo_cone.go version [9d28edc9ac].
Added cli/repo_cone_test.go version [126183d713].
Modified cli/repo_open.go
from [7f971778b0]
to [fc7320cecf].
[diff]
Modified cli/repo_status.go
from [94b74f2de0]
to [1e0296c4de].
[diff]
Modified conformance/coverage_test.go
from [b6e703c915]
to [3745a0911f].
[diff]
Added conformance/horizon_test.go version [025efe98cd].
Added conformance/requirements/horizon.tsv version [bff418effa].
Added conformance/requirements/sparse-cone.tsv version [131f18f14e].
Modified conformance/rfcs/README.md
from [07b94b2f1d]
to [332b16c6b5].
[diff]
Added conformance/rfcs/draft-fossil-horizon-00.txt version [56bf5c0553].
Added conformance/rfcs/draft-fossil-sparse-cone-00.txt version [cc2c259c19].
Added conformance/sparsecone_test.go version [93d20922b5].
Added conformance/sparsecone_zit_test.go version [822c0af0c9].
Added conformance/testdata/zit-cones/commit.json version [941ba438bc].
Added conformance/testdata/zit-cones/commit/2e4f285b59ad354b37084e91a6b4a59af6faf38c79bb433f2326d52afad5d788 version [86e58f92dc].
Added conformance/testdata/zit-cones/commit/3430e346fd7b481448349ed5bed2b8271a7257cdeab0cc1150004128b37b8a92 version [3430e346fd].
Added conformance/testdata/zit-cones/materialized.json version [18b2a60b7b].
Added conformance/testdata/zit-cones/serial.json version [3cf88f15f0].
Modified internal/checkout/checkin.go
from [4443a0258c]
to [ccca6129f6].
[diff]
Modified internal/checkout/checkout.go
from [64f33dcc1c]
to [d7d63a60c8].
[diff]
Modified internal/checkout/extract.go
from [576f04976a]
to [0bd58c1255].
[diff]
Modified internal/checkout/manage.go
from [c8d20809af]
to [b2dcecb8c8].
[diff]
Modified internal/checkout/merge.go
from [2949e83151]
to [467423514f].
[diff]
Modified internal/checkout/rename.go
from [82c4471c6e]
to [1a395c0299].
[diff]
Modified internal/checkout/revert.go
from [8f530617c4]
to [e8dc9c13d8].
[diff]
Added internal/checkout/sparse.go version [6bc485cbff].
Added internal/checkout/sparse_test.go version [8af2831b72].
Modified internal/checkout/status.go
from [37c51d822e]
to [34321b4814].
[diff]
Modified internal/checkout/types.go
from [727002be6c]
to [1461a9fa7d].
[diff]
Modified internal/checkout/update.go
from [555f499d4a]
to [9daf195111].
[diff]
Modified internal/checkout/vfile.go
from [c02f3161d0]
to [d12076889b].
[diff]
Added internal/cone/cone.go version [04e1e10503].
Added internal/cone/cone_test.go version [b7ac136d55].
Added internal/cone/serial.go version [764bda9aa0].
Modified internal/deck/pathname.go
from [0e83225f1d]
to [1106d3b6c3].
[diff]
Modified internal/manifest/files.go
from [de8e2b900c]
to [8b86357e63].
[diff]
Added internal/manifest/filtered_test.go version [58383ff761].
Modified internal/manifest/manifest.go
from [6ba3c2dcea]
to [485289ab27].
[diff]
Modified internal/manifest/tree.go
from [5086a44ef4]
to [3922001315].
[diff]