Overview
| Comment: | merge diff-ignore-ws: zit diff -w ignores whitespace-only changes (#130) |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f863b8d6ef41b48ead6bb5a7bf934f22 |
| User & Date: | dmestas on 2026-08-24 01:35:04.657 |
| Other Links: | manifest | tags |
Context
|
2026-08-24
| ||
| 02:26 | merge merge-probe: mergeability for a caller-named pair (#134) check-in: 83734fcc3d user: dmestas tags: trunk | |
| 01:35 | merge diff-ignore-ws: zit diff -w ignores whitespace-only changes (#130) check-in: f863b8d6ef user: dmestas tags: trunk | |
| 00:52 |
diff: -w ignores whitespace-only changes (#130)
Lines differing only in whitespace compare equal, so a reindent or a CRLF/LF normalization produces no hunks and drops the file from --brief entirely. Comparison only: a line that does survive is emitted with its original bytes. --brief reads content under -w, which it otherwise never does, and runs the same unified() the hunk path runs so the two cannot disagree about whether a file changed. A no-hunk result now claims 'mode changed' only on real byte equality -- with -w it also means a difference that was ignored. closed check-in: 23784ef673 user: dmestas tags: diff-ignore-ws | |
| 00:41 | merge ncard-rule: fossil's per-type N card write rule (#136) check-in: 7f9f9f8927 user: dmestas tags: trunk | |
Changes
Modified src/cmd/history.zig
from [7d117f3c3e]
to [189aa47269].
[diff]
Modified src/cmd/tracking.zig
from [96568eedf5]
to [00172f0182].
[diff]
Modified src/e2e.zig
from [c624a3b291]
to [3d86be22ef].
[diff]
Modified src/main.zig
from [25e5197846]
to [c7bf8939a4].
[diff]
Modified src/textdiff.zig
from [ed9b0ff388]
to [16e45e03e9].
[diff]
Modified www/reference.html
from [2c94ea6c65]
to [c44a13d08f].
[diff]