laumann/pijul - Change GBX4AFASHNICJ25B6PAGXP3C3NJ5PPXZ76STLDVPBUVEGDJP5ZAAC

Personal fork of https://nest.pijul.com/pijul/pijul

Collecting conflicts in output (broken by parallel output)

Created by pmeunier on April 29, 2021

GBX4AFASHNICJ25B6PAGXP3C3NJ5PPXZ76STLDVPBUVEGDJP5ZAAC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/output/output.rs at line 74 [4.671807]

B:BD[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>> {

Insertion in libpijul/src/output/output.rs at line 78 [4.671807]
[3.74522]
[3.74522]
```
    let mut conflicts = Vec::new();
```
Deletion in libpijul/src/output/output.rs at line 82 [4.671807]
∅:D[2.174] → [3.74608:74656]
B:BD[3.74608] → [3.74608:74656]
```
                let mut conflicts = Vec::new();
```
Replacement in libpijul/src/output/output.rs at line 106 [4.671807]
B:BD[3.75449] → [3.75449:75460]
```
    Ok(())
```
[3.75449]
[3.75460]
```
    Ok(conflicts)
```
Replacement in libpijul/src/output/output.rs at line 333 [4.671807]
B:BD[3.79717] → [3.79717:79744]
```
        t.join().unwrap()?
```
[3.79717]
[4.679209]
```
        conflicts.extend(t.join().unwrap()?.into_iter());
```
Replacement in libpijul/src/output/output.rs at line 335 [4.671807]
B:BD[4.679215] → [3.79745:79753]
```
    o?;
```
[4.679215]
[2.1046]
```
    conflicts.extend(o?.into_iter());
```
Insertion in libpijul/src/output/output.rs at line 523 [4.671807]
[5.84714]
[4.684478]
```
                assert!(id.parent_inode >= inode);
```

Deletion in libpijul/src/output/output.rs at line 526 [4.671807]

B:BD[4.684550] → [4.684550:684632]

                } else if id.parent_inode < inode {
                    continue;