Overview
| Comment: | Merge branch 'fix/update-cone-symlink' into feat/submanifest-reader |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
44ac676efeb6a3f5eca0a51da346658c |
| User & Date: | [email protected] on 2026-10-19 23:44:16.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 23:58 | Merge branch 'feat/submanifest-pragma' into feat/submanifest-reader check-in: 6681b95432 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 23:44 | Merge branch 'fix/update-cone-symlink' into feat/submanifest-reader check-in: 44ac676efe user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 22:48 |
test(checkout): a renamed symlink is not merged, and the rename drops the old name
Covers the rename and dry-run paths of Update's symlink conflict: the link is listed in Unmerged, nothing is written through it, and only a real run deletes the old name, as fossil's update does. check-in: ef49615d6c user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 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 | |
Changes
Modified CHANGELOG.md
from [206010b165]
to [2102750c24].
[diff]
Modified checkout_sparse_fossil_interop_test.go
from [a0759909f5]
to [d13f167a88].
[diff]
Modified checkout_update_interop_test.go
from [537e502828]
to [214a7192b4].
[diff]
Modified internal/checkout/perm_unix_test.go
from [e0126071d6]
to [2f27efce99].
[diff]
Modified internal/checkout/sparse_test.go
from [8af2831b72]
to [c20459412a].
[diff]
Modified internal/checkout/update.go
from [9daf195111]
to [0a5b4fdaef].
[diff]