Fixing the numbering of conflicts

pmeunier

Dec 15, 2023, 8:10 PM

HWIOJHTRHIPEQ6KTFH53YLZDUSEYBZQBUPTWABMOG4L4HBS6DPZAC

Dependencies

• [2] GQTC4TJA show first line of change message in conflict markers
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] Z6FWHKCA Improving the UI around zombie conflicts
• [5] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [6] VO5OQW4W Removing anyhow in libpijul
• [7] GA3P7FOM Nicer conflict markers

Change contents

• edit in libpijul/src/alive/output.rs at line 210
  [3.993137]→[2.6315:6362](∅→∅)
  − vbuf.begin_cyclic_conflict::<P>(*id)?;
• edit in libpijul/src/alive/output.rs at line 211
  [3.7560]

  [3.993175]
  + vbuf.begin_cyclic_conflict::<P>(*id)?;
• edit in libpijul/src/alive/output.rs at line 217
  [3.7598]

  [3.7598]
  + *id += 1;
• edit in libpijul/src/alive/output.rs at line 222
  [2.6447]→[3.7785:7810](∅→∅),[3.7785]→[3.7785:7810](∅→∅)
  − *id += 1