Overview
| Comment: | Three-way merge walks the two edit scripts as Fossil's merge3.c does (D. Richard Hipp), so an edit beside the other side's change merges cleanly and every merge decision and merged text matches fossil 3-way-merge, except where a final newline or a byte-order mark is kept on purpose |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
c1b7a787d9df84b2381703cf68860fe8 |
| User & Date: | dmestas on 2026-11-08 05:22:43.797 |
| Other Links: | manifest | tags |
Context
|
2026-11-08
| ||
| 11:59 | Daemon opens the commit core on first commit, catches its reader up in place, and pages feed with limit check-in: 04aeaeface user: dmestas tags: trunk | |
| 05:22 | Three-way merge walks the two edit scripts as Fossil's merge3.c does (D. Richard Hipp), so an edit beside the other side's change merges cleanly and every merge decision and merged text matches fossil 3-way-merge, except where a final newline or a byte-order mark is kept on purpose check-in: c1b7a787d9 user: dmestas tags: trunk | |
| 04:02 | log for a path takes --offset, as Fossil's finfo spells it, and --cursor, the daemon's cursor, returning the next one in -F json; a check-in's entry for one file is found by searching its manifest instead of parsing it whole, and JSON rows take user and comment from derived state, so a cursor page of a deep history costs tens of milliseconds check-in: 1ed38cab8a user: dmestas tags: trunk | |
Changes
Modified src/e2e.zig
from [8233a54f3c]
to [957a68e5cc].
[diff]
Modified src/merge3.zig
from [0fe8628367]
to [e3e06cd5d4].
[diff]