Collecting conflicts in output (broken by parallel output)

Dependencies

• [2] YCEZL7VF Moving to temporary paths when outputting
• [3] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [4] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [5] VO5OQW4W Removing anyhow in libpijul
• [6] I24UEJQL Various post-fire fixes
• [7] YN63NUZO Sanakirja 1.0

Change contents

• replacement in libpijul/src/output/output.rs at line 74
  [3.74309]→[3.74309:74375](∅→∅)
  − ) -> Result<(), OutputError<P::Error, T::GraphError, R::Error>> {
  [3.74309]

  [3.74375]
  + ) -> Result<Vec<Conflict>, OutputError<P::Error, T::GraphError, R::Error>> {
• edit in libpijul/src/output/output.rs at line 78
  [3.74522]

  [3.74522]
  + let mut conflicts = Vec::new();
• edit in libpijul/src/output/output.rs at line 82
  [2.174]→[3.74608:74656](∅→∅),[3.74608]→[3.74608:74656](∅→∅)
  − let mut conflicts = Vec::new();
• replacement in libpijul/src/output/output.rs at line 106
  [3.75449]→[3.75449:75460](∅→∅)
  − Ok(())
  [3.75449]

  [3.75460]
  + Ok(conflicts)
• replacement in libpijul/src/output/output.rs at line 333
  [3.79717]→[3.79717:79744](∅→∅)
  − t.join().unwrap()?
  [3.79717]

  [3.679209]
  + conflicts.extend(t.join().unwrap()?.into_iter());
• replacement in libpijul/src/output/output.rs at line 335
  [3.679215]→[3.79745:79753](∅→∅)
  − o?;
  [3.679215]

  [2.1046]
  + conflicts.extend(o?.into_iter());
• edit in libpijul/src/output/output.rs at line 523
  [3.84714]

  [3.684478]
  + assert!(id.parent_inode >= inode);
• edit in libpijul/src/output/output.rs at line 526
  [3.684550]→[3.684550:684632](∅→∅)
  − } else if id.parent_inode < inode {

  − continue;