Fossil

Check-in [b491c196]
Login

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

Overview
Comment:Ensure that there is always a newline before a conflict mark in merge output. See the forum discussion.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b491c196c23ec4a240f4e9558791fbe7e34ea98b17cfd4edaba0c641a4fea216
User & Date: drh 2021-03-10 12:34:45
Original Comment: Ensure that there is always a newline before a conflict mark in merge output.
Context
2021-03-11
13:22
Numerous help text consistency tweaks based on forum discussion 8c644048f0. ... (check-in: 4cb50c4e user: stephan tags: trunk)
2021-03-10
12:34
Ensure that there is always a newline before a conflict mark in merge output. See the forum discussion. ... (check-in: b491c196 user: drh tags: trunk)
2021-03-09
21:24
Update the built-in SQLite to the second 3.35.0 beta, for testing. ... (check-in: b4687298 user: drh tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/merge3.c.

315
316
317
318
319
320
321

322
323
324
325
326
327
328
      */
      int sz = 1;    /* Size of the conflict in lines */
      nConflict++;
      while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){
        sz++;
      }
      DEBUG( printf("CONFLICT %d\n", sz); )

      blob_append(pOut, mergeMarker[0], -1);
      ensure_line_end(pOut, useCrLf);
      i1 = output_one_side(pOut, pV1, aC1, i1, sz);
      ensure_line_end(pOut, useCrLf);
      blob_append(pOut, mergeMarker[1], -1);
      ensure_line_end(pOut, useCrLf);
      blob_copy_lines(pOut, pPivot, sz);







>







315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
      */
      int sz = 1;    /* Size of the conflict in lines */
      nConflict++;
      while( !ends_at_CPY(&aC1[i1], sz) || !ends_at_CPY(&aC2[i2], sz) ){
        sz++;
      }
      DEBUG( printf("CONFLICT %d\n", sz); )
      ensure_line_end(pOut, useCrLf);
      blob_append(pOut, mergeMarker[0], -1);
      ensure_line_end(pOut, useCrLf);
      i1 = output_one_side(pOut, pV1, aC1, i1, sz);
      ensure_line_end(pOut, useCrLf);
      blob_append(pOut, mergeMarker[1], -1);
      ensure_line_end(pOut, useCrLf);
      blob_copy_lines(pOut, pPivot, sz);