Fixing a bug that could cause some conflict resolution markers to be ignored when diffing

pmeunier

Feb 27, 2023, 5:34 PM

ADZQB6NYJ2TUVXPIEWOZT7D7C7TU2MRB6PXFKZCR2TBLPWUCR6XQC

Dependencies

• [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [3] IYJZVLET Cleaning up the literate programming bits

Change contents

• replacement in libpijul/src/diff/replace.rs at line 298
  [2.790034]→[2.790034:790086](∅→∅)
  − while pos_bytes < next_vertex_pos {
  [2.790034]

  [2.790086]
  + loop {
• edit in libpijul/src/diff/replace.rs at line 309
  [2.790553]

  [2.790553]
  + }

  + if pos_bytes >= next_vertex_pos {

  + break