Recording files with multiple names (some files were given no name at all)

pmeunier

Jan 4, 2022, 11:35 AM

LRIUJWCRXAFMNHB65RIQATYDNYJEBWVGNU6ZZSUJBWBFMHKYUGRQC

Dependencies

• [2] A6WKPB55 Detecting (and recording) conflicts between multiple equal names for the same file
• [3] YN63NUZO Sanakirja 1.0
• [4] ZXTHL45O address clippy lints
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• replacement in libpijul/src/record.rs at line 1410
  [3.515412]→[3.515412:515460](∅→∅)
  − moved.need_new_name = false
  [3.515412]

  [3.515460]
  + moved.need_new_name = false;

  + // We've found an alive parent, delete the others.

  + is_first_parent = false;
• replacement in libpijul/src/record.rs at line 1433
  [3.516251]→[3.516251:516334](∅→∅)
  − // The following is really important in missing context detection:
  [3.516251]

  [3.53387]
  + // The following extra edge is meant to allow

  + // detection of missing contexts in folders: indeed,

  + // if we didn't have it, we couldn't tell the

  + // difference between a convergent renaming or

  + // deletion and a conflict between a renaming and a

  + // deletion.
• replacement in libpijul/src/record.rs at line 1454
  [3.53800]→[3.517048:517106](∅→∅),[3.517048]→[3.517048:517106](∅→∅),[3.517106]→[2.210:276](∅→∅)
  − moved.need_new_name = false

  − }

  − if !grandparent.flag().contains(EdgeFlags::DELETED) {
  [3.53800]

  [2.276]
  + moved.need_new_name = false;

  + // We've found an alive parent, delete the others.