Solving a conflict (due to the new conflict detection algorithm)

pmeunier

Dec 27, 2023, 2:02 PM

J2OHO7RASKJ2FN7PMKOGPXPPOVP4BPGBEUS2YD5FJY35A4PBNQBAC

Dependencies

• [2] RFLKHQ2Y First read all stdin when applying a patch, in order to avoid blocking
• [3] A3RM526Y Integrating identity malleability
• [4] ZBNKSYA6 Fixing a bus error when starting a transaction on a full disk
• [5] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [7] RUBBHYZ7 Removing unnecessary async/await
• [8] ZDQB72IK When running `pijul apply` with stdin, immediately quit if the channel does not exist
• [9] JL4WKA5P Implement the Sanakirja concurrency model in a cross-process way

Change contents

• edit in pijul/src/commands/apply.rs at line 247
  [3.25009]→[2.0:1](∅→∅)
  −
• resolve order conflict in pijul/src/commands/apply.rs at line 247
  [3.196360]