dblsaiko/pijul - Change A6WKPB55EV7AT3FTLQ67VQGSD55HHRQTBQWXXI7CRZS7NFZHRRSAC

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

Created by pmeunier on August 19, 2021

A6WKPB55EV7AT3FTLQ67VQGSD55HHRQTBQWXXI7CRZS7NFZHRRSAC

Dependencies

In channels

main

Change contents

Insertion in libpijul/src/record.rs at line 1018 [4.488880]
[2.36]
[3.34470]
```
    let mut is_first_parent = true;
```

Replacement in libpijul/src/record.rs at line 1138 [4.488880]

B:BD[4.515807] → [2.522:614]

            } else if grandparent_changed || name_changed || (meta_changed && cfg!(unix)) {

[4.515807]

[4.515867]

            } else if grandparent_changed
                || name_changed
                || (meta_changed && cfg!(unix))
                || !is_first_parent
            {

Insertion in libpijul/src/record.rs at line 1168 [4.488880]

[4.517106]

[4.517106]

            if !grandparent.flag().contains(EdgeFlags::DELETED) {
                is_first_parent = false;
            }