Overview
| Comment: | Merge branch 'fix/stash-undo-storage' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md # internal/checkout/vfile.go |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
189088f46c13e02622f6881eaa176767 |
| User & Date: | [email protected] on 2026-10-19 12:47:01.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-19
| ||
| 12:47 |
Merge branch 'perf/rebuild-blob-check' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md check-in: e3c81fb936 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 12:47 |
Merge branch 'fix/stash-undo-storage' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md # internal/checkout/vfile.go check-in: 189088f46c user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 12:46 |
Merge branch 'fix/merge3-markers' into feat/submanifest-reader
# Conflicts: # CHANGELOG.md check-in: 2a0701c7d3 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 01:54 |
Merge remote-tracking branch 'origin/main' into fix/stash-undo-storage
# Conflicts: # CHANGELOG.md check-in: 044f6da5e0 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [81d352d12a]
to [89ab0d9ff7].
[diff]
Modified integration_cli_test.go
from [72bb196cb3]
to [1b779f61ac].
[diff]
Modified internal/checkout/mtime.go
from [bb7abeed4b]
to [d16e9ca883].
[diff]
Modified internal/checkout/setmtime.go
from [f8bce6d63a]
to [2b0f48313e].
[diff]
Modified internal/checkout/vfile.go
from [eb9ac69c1e]
to [81120b23a5].
[diff]
Added internal/stash/fossilbin_test.go version [a53d6c02ce].
Modified internal/stash/stash.go
from [bc11b25a40]
to [0374f5b6a6].
[diff]
Modified internal/stash/stash_test.go
from [0f2b5f3722]
to [51bfc8e761].
[diff]
Added internal/stash/storage_test.go version [de8ceaed0c].
Added internal/undo/fossilbin_test.go version [b9697b25a5].
Added internal/undo/storage_test.go version [02bb914246].
Modified internal/undo/undo.go
from [30f1225469]
to [103b9c7018].
[diff]
Modified internal/undo/undo_test.go
from [05a4697255]
to [aa7e78ff61].
[diff]
Added internal/vfile/mtime.go version [4d45c6c23d].