Overview
| Comment: | Merge branch 'fix/stash-undo-followups' into feat/submanifest-reader |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
22101b521fd4e2590877df861e6f8639 |
| User & Date: | [email protected] on 2026-10-19 18:27:24.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 18:27 | Merge branch 'fix/receipt-followups' into feat/submanifest-reader check-in: 41ff5d315a user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 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: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 [a781df0b3c]
to [335af92b48].
[diff]
Modified checkout_undo.go
from [2c65756f08]
to [a582489f97].
[diff]
Added checkout_undo_test.go version [dfd6dc3df4].
Modified checkout_update_undo_interop_test.go
from [f105e9536b]
to [f481499295].
[diff]
Modified integration_cli_test.go
from [1b779f61ac]
to [f18c6b7929].
[diff]
Modified internal/checkout/undo.go
from [fcfc1d65db]
to [5a29ca30ff].
[diff]
Modified internal/checkout/update_undo_test.go
from [c0c87773cd]
to [053e216793].
[diff]
Modified internal/stash/fossilbin_test.go
from [a53d6c02ce]
to [bcf645ccf9].
[diff]
Modified internal/stash/stash.go
from [0374f5b6a6]
to [602cda036a].
[diff]
Modified internal/stash/stash_test.go
from [51bfc8e761]
to [7d2e257281].
[diff]
Modified internal/stash/storage_test.go
from [de8ceaed0c]
to [b6069cf662].
[diff]
Modified internal/undo/fossilbin_test.go
from [b9697b25a5]
to [bd87a59ea9].
[diff]
Modified internal/undo/storage_test.go
from [02bb914246]
to [c8c1def66e].
[diff]
Modified internal/undo/undo.go
from [95b1b54758]
to [42b035facc].
[diff]
Modified internal/undo/undo_test.go
from [aa7e78ff61]
to [5a1be7db18].
[diff]