Fixing conflict identifiers (some nested conflicts were wrong)

pmeunier

Jan 4, 2022, 8:41 AM

7GQSGIV5ZRNFT4TRZCG6AW54BZTPSSS75O4HQADOVGMYKO7P6GJQC

Dependencies

• [2] GA3P7FOM Nicer conflict markers
• [3] VO5OQW4W Removing anyhow in libpijul
• [4] Z6FWHKCA Improving the UI around zombie conflicts
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in libpijul/src/alive/output.rs at line 14
  [3.988841]

  [3.988841]
  + id: usize,
• edit in libpijul/src/alive/output.rs at line 30
  [3.989196]

  [3.989196]
  + id: 0,
• edit in libpijul/src/alive/output.rs at line 36
  [3.989290]→[2.5701:5723](∅→∅)
  − let id0 = id;
• edit in libpijul/src/alive/output.rs at line 62
  [2.6150]→[2.6150:6171](∅→∅)
  − id += 1;
• replacement in libpijul/src/alive/output.rs at line 74
  [2.6529]→[2.6529:6599](∅→∅)
  − line_buf.conflict_next(id0, &[&ext.into()])?;
  [2.6529]

  [2.6599]
  + line_buf.conflict_next(elt.id, &[&ext.into()])?;
• replacement in libpijul/src/alive/output.rs at line 77
  [2.6648]→[2.6648:6707](∅→∅)
  − line_buf.conflict_next(id0, &[])?;
  [2.6648]

  [2.6707]
  + line_buf.conflict_next(elt.id, &[])?;
• edit in libpijul/src/alive/output.rs at line 98
  [3.990786]

  [3.990786]
  + id += 1;
• edit in libpijul/src/alive/output.rs at line 103
  [3.990959]

  [3.990959]
  + id,
• replacement in libpijul/src/alive/output.rs at line 118
  [3.919]→[2.7186:7231](∅→∅)
  − line_buf.end_conflict(id0)?;
  [3.919]

  [3.991308]
  + line_buf.end_conflict(elt.id)?;