Fossil

Check-in [7fd2a365]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the unified diff output so that it conforms with established conventions.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:7fd2a3652ea7368abd40d5c9af07b0e56feb9091bd7c3380e3f28a7773a6b191
User & Date: drh 2019-02-05 15:49:11
Context
2019-02-05
20:54
Update the built-in SQLite to the latest 3.27.0 beta for testing. check-in: 1dbf923c user: drh tags: trunk
15:49
Fix the unified diff output so that it conforms with established conventions. check-in: 7fd2a365 user: drh tags: trunk
15:43
Enhance the "reconstruct" command so that sets the correct hash policy for artifacts read from disk. check-in: 93bb3231 user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.c.

438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
      if( html ) blob_appendf(pOut, "<span class=\"diffln\">");
      /*
       * If the patch changes an empty file or results in an empty file,
       * the block header must use 0,0 as position indicator and not 1,0.
       * Otherwise, patch would be confused and may reject the diff.
       */
      blob_appendf(pOut,"@@ -%d,%d +%d,%d @@",
        na ? a+skip+1 : 0, na,
        nb ? b+skip+1 : 0, nb);
      if( html ) blob_appendf(pOut, "</span>");
      blob_append(pOut, "\n", 1);
    }

    /* Show the initial common area */
    a += skip;
    b += skip;







|
|







438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
      if( html ) blob_appendf(pOut, "<span class=\"diffln\">");
      /*
       * If the patch changes an empty file or results in an empty file,
       * the block header must use 0,0 as position indicator and not 1,0.
       * Otherwise, patch would be confused and may reject the diff.
       */
      blob_appendf(pOut,"@@ -%d,%d +%d,%d @@",
        na ? a+skip+1 : a+skip, na,
        nb ? b+skip+1 : b+skip, nb);
      if( html ) blob_appendf(pOut, "</span>");
      blob_append(pOut, "\n", 1);
    }

    /* Show the initial common area */
    a += skip;
    b += skip;