Overview
| Comment: | Merge branch 'feat/submanifest-reader' into fix/stash-undo-followups
# Conflicts: # internal/undo/undo.go |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
d6ac19e58045d21fba4a69c8bc561155 |
| User & Date: | [email protected] on 2026-10-19 16:29:46.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 18:27 | Merge branch 'fix/stash-undo-followups' into feat/submanifest-reader check-in: 22101b521f user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 16:29 |
Merge branch 'feat/submanifest-reader' into fix/stash-undo-followups
# Conflicts: # internal/undo/undo.go check-in: d6ac19e580 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 16:26 |
fix(stash,undo): scan before stashing; return undo changes, print nothing
Stash save now scans the checkout first, as fossil's stash_create does (vfile_check_signature), so an edit no scan had recorded is stashed too. Save takes the scanner, a *checkout.Checkout, as its first argument. Undo and redo no longer print to standard output: they return the files they changed, as []undo.Change, in the undo table's row order, the order fossil undoes them in. Tracked in #448 check-in: 2dfae63b63 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 16:25 | Merge branch 'fix/update-undo' into feat/submanifest-reader check-in: da7c8a19cd user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [3478f02898]
to [335af92b48].
[diff]
Modified checkout.go
from [71a64d73c7]
to [39ce8047ec].
[diff]
Added checkout_undo.go version [a582489f97].
Added checkout_undo_test.go version [dfd6dc3df4].
Added checkout_update_renames_interop_test.go version [b062907e4b].
Added checkout_update_undo_interop_test.go version [f481499295].
Modified internal/checkout/types.go
from [c381a4d3ed]
to [727002be6c].
[diff]
Added internal/checkout/undo.go version [5a29ca30ff].
Modified internal/checkout/update.go
from [809d3088c5]
to [5e46525cc5].
[diff]
Added internal/checkout/update_renames_test.go version [1d916c7eab].
Added internal/checkout/update_undo.go version [e20f5cbe51].
Added internal/checkout/update_undo_js.go version [95503c2e70].
Added internal/checkout/update_undo_test.go version [053e216793].
Added internal/path/renames.go version [66155dc09c].
Modified internal/undo/undo.go
from [45ca58f26b]
to [42b035facc].
[diff]