Parents and children of check-in [1ed38cab8a]
|
2026-11-08
| ||
| 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 | |
| 03:00 | annotate finds a file's versions from the file-history index and walks only as far as -n or the nearest cached version needs, and a repository lookup that scanned the whole image per call builds a table instead, so annotate -n 50 on a 644 MB store costs 50 ms instead of 38 s check-in: 19bcb02c0c user: dmestas tags: trunk | |