Overview
| Comment: | merge takes a mode the other side alone changed, as Fossil does; an overwrite applies the mode |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
8dba50836f97011b7ec5b876dc727cde |
| User & Date: | dmestas on 2026-09-28 22:55:38.166 |
| Other Links: | manifest | tags |
Context
|
2026-09-28
| ||
| 23:13 | One store-level merge produces the merged tree, modes included; merge --probe, the chained probe and landing call it check-in: c61f1fc9ff user: dmestas tags: trunk | |
| 22:55 | merge takes a mode the other side alone changed, as Fossil does; an overwrite applies the mode check-in: 8dba50836f user: dmestas tags: trunk | |
| 22:23 | landing reads find forum posts through an index kept in .zit-cache, walking only what was appended since the last read check-in: 658d4a733d user: dmestas tags: trunk | |
Changes
Modified src/cmd/checkout.zig
from [79309ecf56]
to [ca406f0517].
[diff]
Modified src/e2e.zig
from [812d58242f]
to [19dfd67924].
[diff]
Modified src/update.zig
from [d4d2ec17aa]
to [10726509b5].
[diff]