Overview
| Comment: | Merge branch 'feat/submanifest-reader' into fix/revert-swap-chain |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
c7a321a35dc42b1e67045cac1e854be3 |
| User & Date: | [email protected] on 2026-10-20 01:30:07.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-20
| ||
| 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 | |
| 01:30 | Merge branch 'feat/submanifest-reader' into fix/revert-swap-chain check-in: c7a321a35d user: [email protected] tags: feat/submanifest-reader, main, trunk | |
|
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 | |
| 22:49 |
test(checkout): pin revert of renames against fossil's revert and undo
An add at a rename's old name ends as fossil's revert leaves it, by every name the revert can be given, and Undo restores what fossil undo does. A three-file rotation and a chain reverted by its middle name end under their committed names; reverting only a chain's second rename keeps the first one pending. Tracked in #248. check-in: 4bec3ce730 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [d83adb8870]
to [00f0f108d9].
[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 cli/repo_submanifests.go
from [4c72bf02f1]
to [bec27e5f50].
[diff]
Modified conformance/requirements/submanifest.tsv
from [6c919e9c7e]
to [857adbefa7].
[diff]
Modified conformance/rfcs/README.md
from [332b16c6b5]
to [a90c2edeec].
[diff]
Modified conformance/rfcs/draft-fossil-submanifests-00.txt
from [eaef2e2e36]
to [22c3592cdd].
[diff]
Modified conformance/submanifest_test.go
from [ea089f85da]
to [87195d5e3b].
[diff]
Modified conformance/submanifest_writer_test.go
from [2f1bcf9cd6]
to [4605f4fd94].
[diff]
Modified conformance/sync_client_clone_test.go
from [0578726e98]
to [b6279965a2].
[diff]
Modified conformance/zit_interop_test.go
from [6991c502bb]
to [9589c1a7d9].
[diff]
Modified docs/site/content/docs/reference/sdk/libfossil/api.md
from [a0568b06df]
to [948f11ed4b].
[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]
Modified internal/manifest/submanifest_write.go
from [a7da860836]
to [66b39dbe86].
[diff]
Modified internal/manifest/submanifest_write_test.go
from [ac554fffcc]
to [fa8cd4e04c].
[diff]
Modified internal/sync/client.go
from [ab1b976840]
to [40c42b11e5].
[diff]
Modified internal/sync/clone.go
from [ccf76906c9]
to [5156cb365d].
[diff]
Modified internal/sync/handler.go
from [e0dff724d6]
to [55cc47ade7].
[diff]
Modified internal/sync/handler_test.go
from [135ca4b1dc]
to [de7a85f8a6].
[diff]
Modified internal/sync/session.go
from [1162ddca98]
to [2c9624923f].
[diff]
Modified internal/sync/submanifest.go
from [7c5a0dd0c8]
to [76f26b39bd].
[diff]
Modified internal/sync/submanifest_test.go
from [7f07d62ba6]
to [2a8553fda8].
[diff]
Modified internal/sync/version.go
from [c209912b17]
to [79a6048068].
[diff]
Modified repo_submanifest.go
from [4ffa6a3bdf]
to [e7e65bd8ee].
[diff]
Modified repo_submanifest_test.go
from [46924bfb17]
to [b4958a51d4].
[diff]