Fossil SCM
More test cases for the side-by-side diff. No changes to code.
Commit
47dacaa69b6ceaf2fc37534470d4bd1fe2a5f0c4
Parent
233c4975a82cf89…
1 file changed
+13
-2
+13
-2
| --- test/diff-test-1.wiki | ||
| +++ test/diff-test-1.wiki | ||
| @@ -18,17 +18,28 @@ | ||
| 18 | 18 | * <a href="../../../fdiff?v1=57b0d8183cab0e3d&v2=37b3ef49d73cdfe6" |
| 19 | 19 | target="testwindow">Large diff of sqlite3.c</a>. This diff was very |
| 20 | 20 | slow prior to the preformance enhancement change [9e15437e97]. |
| 21 | 21 | * <a href="../../../info/bda00cbada#chunk42" target="testwindow"> |
| 22 | 22 | A difficult indentation change. |
| 23 | + * <a href="../../../fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk13" | |
| 24 | + target="testwindow">Another tricky indentation. Notice especially | |
| 25 | + lines 59398 and 59407 on the left</a> | |
| 26 | + * <a href="../../../fdiff?v2=955cc67ace8fb622&v1=e2e1c87b86664b45#chunk13" | |
| 27 | + target="testwindow">Inverse of the previous.</a> | |
| 28 | + * <a href="../../../fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk24" | |
| 29 | + target="testwindow">A complex change that is difficult to align, and | |
| 30 | + hence falls back to the "delete left and insert right" strategy.</a> | |
| 31 | + * <a href="../../../fdiff?v2=955cc67ace8fb622&v1=e2e1c87b86664b45#chunk24" | |
| 32 | + target="testwindow">Inverse of the previous.</a> | |
| 23 | 33 | |
| 24 | 34 | External: |
| 25 | 35 | |
| 26 | 36 | * <a href="http://www.sqlite.org/src/fdiff?v1=aafcb21a74e41f9a&v2=a6d127dd05daf0f9#chunk3" target="testwindow"> |
| 27 | 37 | Code indentation change.</a> |
| 28 | - * <a href="http://www.sqlite.org/src/info/52e755943f"> | |
| 38 | + * <a href="http://www.sqlite.org/src/info/52e755943f" target="testwindow"> | |
| 29 | 39 | A complex change (chunk 1) in which the alignment becomes so complex |
| 30 | 40 | that it is better for clarity to abandon it and just show the left |
| 31 | 41 | and right sides contiguously.</a> |
| 32 | - * <a href="http://www.sqlite.org/src/info/3d65c70343#chunk5"> | |
| 42 | + * <a href="http://www.sqlite.org/src/info/3d65c70343#chunk5" | |
| 43 | + target="testwindow"> | |
| 33 | 44 | An indentation change. See especially lines 2313 and 2317 on the right, |
| 34 | 45 | that their green indentation addition is left-justified.</a> |
| 35 | 46 |
| --- test/diff-test-1.wiki | |
| +++ test/diff-test-1.wiki | |
| @@ -18,17 +18,28 @@ | |
| 18 | * <a href="../../../fdiff?v1=57b0d8183cab0e3d&v2=37b3ef49d73cdfe6" |
| 19 | target="testwindow">Large diff of sqlite3.c</a>. This diff was very |
| 20 | slow prior to the preformance enhancement change [9e15437e97]. |
| 21 | * <a href="../../../info/bda00cbada#chunk42" target="testwindow"> |
| 22 | A difficult indentation change. |
| 23 | |
| 24 | External: |
| 25 | |
| 26 | * <a href="http://www.sqlite.org/src/fdiff?v1=aafcb21a74e41f9a&v2=a6d127dd05daf0f9#chunk3" target="testwindow"> |
| 27 | Code indentation change.</a> |
| 28 | * <a href="http://www.sqlite.org/src/info/52e755943f"> |
| 29 | A complex change (chunk 1) in which the alignment becomes so complex |
| 30 | that it is better for clarity to abandon it and just show the left |
| 31 | and right sides contiguously.</a> |
| 32 | * <a href="http://www.sqlite.org/src/info/3d65c70343#chunk5"> |
| 33 | An indentation change. See especially lines 2313 and 2317 on the right, |
| 34 | that their green indentation addition is left-justified.</a> |
| 35 |
| --- test/diff-test-1.wiki | |
| +++ test/diff-test-1.wiki | |
| @@ -18,17 +18,28 @@ | |
| 18 | * <a href="../../../fdiff?v1=57b0d8183cab0e3d&v2=37b3ef49d73cdfe6" |
| 19 | target="testwindow">Large diff of sqlite3.c</a>. This diff was very |
| 20 | slow prior to the preformance enhancement change [9e15437e97]. |
| 21 | * <a href="../../../info/bda00cbada#chunk42" target="testwindow"> |
| 22 | A difficult indentation change. |
| 23 | * <a href="../../../fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk13" |
| 24 | target="testwindow">Another tricky indentation. Notice especially |
| 25 | lines 59398 and 59407 on the left</a> |
| 26 | * <a href="../../../fdiff?v2=955cc67ace8fb622&v1=e2e1c87b86664b45#chunk13" |
| 27 | target="testwindow">Inverse of the previous.</a> |
| 28 | * <a href="../../../fdiff?v1=955cc67ace8fb622&v2=e2e1c87b86664b45#chunk24" |
| 29 | target="testwindow">A complex change that is difficult to align, and |
| 30 | hence falls back to the "delete left and insert right" strategy.</a> |
| 31 | * <a href="../../../fdiff?v2=955cc67ace8fb622&v1=e2e1c87b86664b45#chunk24" |
| 32 | target="testwindow">Inverse of the previous.</a> |
| 33 | |
| 34 | External: |
| 35 | |
| 36 | * <a href="http://www.sqlite.org/src/fdiff?v1=aafcb21a74e41f9a&v2=a6d127dd05daf0f9#chunk3" target="testwindow"> |
| 37 | Code indentation change.</a> |
| 38 | * <a href="http://www.sqlite.org/src/info/52e755943f" target="testwindow"> |
| 39 | A complex change (chunk 1) in which the alignment becomes so complex |
| 40 | that it is better for clarity to abandon it and just show the left |
| 41 | and right sides contiguously.</a> |
| 42 | * <a href="http://www.sqlite.org/src/info/3d65c70343#chunk5" |
| 43 | target="testwindow"> |
| 44 | An indentation change. See especially lines 2313 and 2317 on the right, |
| 45 | that their green indentation addition is left-justified.</a> |
| 46 |