Detecting (and recording) conflicts between multiple equal names for the same file

pmeunier

Aug 19, 2021, 2:54 PM

A6WKPB55EV7AT3FTLQ67VQGSD55HHRQTBQWXXI7CRZS7NFZHRRSAC

Dependencies

• [2] SAADQM3H Finer-grained detection of metadata on Windows
• [3] YN63NUZO Sanakirja 1.0
• [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [*] I52XSRUH Massive cleanup, and simplification

Change contents

• edit in libpijul/src/record.rs at line 1018
  [2.36]

  [6.34470]
  + let mut is_first_parent = true;
• replacement in libpijul/src/record.rs at line 1138
  [3.515807]→[2.522:614](∅→∅)
  − } else if grandparent_changed || name_changed || (meta_changed && cfg!(unix)) {
  [3.515807]

  [3.515867]
  + } else if grandparent_changed

  + || name_changed

  + || (meta_changed && cfg!(unix))

  + || !is_first_parent

  + {
• edit in libpijul/src/record.rs at line 1168
  [3.517106]

  [3.517106]
  + if !grandparent.flag().contains(EdgeFlags::DELETED) {

  + is_first_parent = false;

  + }