Fixing conflicts

pmeunier

Feb 27, 2023, 6:17 PM

KZUINTAEFBWRUZB3BZM6P3MCDXWYC4EBUZ5RR7NR5AN6KJKVUAKQC

Dependencies

• [2] TGA6QXGI Initial support for binary diffs (conflicts are not yet supported in the output)
• [3] TVVW53HZ Conflict resolution
• [4] YN63NUZO Sanakirja 1.0
• [5] XR7MNOMU file encoding in updates
• [6] NYOF5766 track file encoding in the record, including change text for file adds
• [7] I24UEJQL Various post-fire fixes
• [8] 3UZ65KYC Fix an old conflict
• [9] EQLDTLXV Fixing a bug with empty new files, and another one with empty replacements
• [10] PDTUHOMV fix left over conflicts
• [11] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• resurrect zombie in libpijul/src/record.rs at line 991
  [4.57747]→[4.0:29](∅→∅),[4.497247]→[4.0:29](∅→∅),[4.57747]→[4.0:29](∅→∅),[4.497247]→[4.0:29](∅→∅),[4.497247]→[4.0:29](∅→∅)
  + if end > start {
• resurrect zombie in libpijul/src/diff/mod.rs at line 7
  [4.677]→[2.0:10](∅→∅),[4.677]→[2.0:10](∅→∅)
  + mod bin;

  +