Recording an empty edit causing a conflict

pmeunier

Feb 7, 2024, 4:44 PM

VJ3CIT6OXI4FMR2N4NSBOAWL73TTOFNZAO2YPLQAZIX32TMJ77OQC

Dependencies

• [2] J2OHO7RA Solving a conflict (due to the new conflict detection algorithm)
• [3] DDJO7X2P Remove dependency on `num_cpus`
• [4] ISZ65SPQ Checking that `pijul apply` does not destroy unrecorded changes
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in pijul/src/commands/apply.rs at line 240
  [4.196360]→[2.0:0](∅→∅),[4.196360]→[3.2223:2223](∅→∅)
  −

  −