1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
+
+
|
An informal list of FIXMEs which don't warrant full tickets...
This is not *intended* to be a list of long-lived fixme's, but more of a scratchpad for things which come up spontaneously and shouldn't be forgotten.
In no particular order...
# Diff Engine v2
Related to the "v2" diff engine (2021 edition)...
## Diff formats with chunk headers sometimes split unnecessarily
Ticket [](746ebbe86c20b5c0f96cdadd19abd8284770de16).
When outputing to a format which uses "chunk headers" (like unified) can sometimes split two chunks which are directly adjacent:
```
$ ./f-vdiff 072d63965188 a725befe5863 -l '*vdiff*' | head -30
Index: f-apps/f-vdiff.c
==================================================================
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
-
+
|
$ f-vdiff -f u > X # (--from 9769c4f75639) gives similar results
$ fossil diff --unified > Y # (--from 9769c4f75639) gives much smaller results
$ ls -la X Y
-rw-rw-r-- 1 stephan stephan 282218662 Jan 15 10:34 X
-rw-rw-r-- 1 stephan stephan 584208 Jan 15 10:35 Y
```
_!?!?!?_ The root cause is as yet unknown. Results are similar with other diff formats.
_!?!?!?_ Results are similar with other diff formats.
## Backports from Fossil
This list is for potential backports from fossil which should be investigated more closely to determine whether they need to be adapted for use in this library:
- Improved diff output with `--from BRANCH` when it names a branch which was just merged into the local checkout: <s>[](fossil:edb3a3a06369c1e7bd29)</s>
|