ilyagr/pijul - Change L4EZSH6BBU46PVEG2HRPKIMIX7HUXUUEX5PGYYW2I3GXWKSFZAHAC

Fixing zombie conflicts: known was computed on the wrong thing

When checking known patches to detect zombie conflicts, the "known" list was computed on the neighbouring changes (when producing patches), whereas the checks were performed on the edges.

Created by pmeunier on May 13, 2022

L4EZSH6BBU46PVEG2HRPKIMIX7HUXUUEX5PGYYW2I3GXWKSFZAHAC

Dependencies

In channels

main

Change contents

Insertion in libpijul/src/unrecord/mod.rs at line 446 [4.231493]

[3.98]

                if h == &hash {
                    return true
                }

Replacement in libpijul/src/unrecord/mod.rs at line 450 [4.231493]

B:BD[3.162] → [3.162:353]

                    // When reintroducing a deleted flag, check whether
                    // the re-introduction patch knows about the alive
                    // edges around the target.

[3.162]

[3.353]

                    // When reintroducing an edge that was deleted,
                    // check whether the re-introduction patch knows
                    // about the alive edges around the target.

Insertion in libpijul/src/find_alive.rs at line 43 [4.763306]

[2.3653]

                        // A `None` in the cache means that the vertex
                        // itself (the cache key) is alive.

Insertion in libpijul/src/changestore/mod.rs at line 58 [4.817216]
[5.33997]
[4.818914]
```
        debug!("knows: {:?} {:?}", hash0, hash1);
```

Insertion in libpijul/src/apply/edge.rs at line 109 [6.96160]

[6.99100]

        // We're deleting a vertex n.to. If n has children or parents
        // that are unknown to the patch we're applying, zombify these
        // children and parents.

Replacement in libpijul/src/apply/edge.rs at line 134 [6.96160]
B:BD[6.99690] → [6.99690:99729]
```
        let intro = v.introduced_by();
```
[6.99690]
[6.99729]
```
        let intro = v.dest().change;
```
Replacement in libpijul/src/apply/edge.rs at line 148 [6.96160]
B:BD[6.100116] → [6.100116:100159]
```
            let intro = v.introduced_by();
```
[6.100116]
[3.2429]
```
            let intro = v.dest().change;
```

Replacement in libpijul/src/apply/edge.rs at line 341 [6.96160]

B:BD[6.106225] → [6.106225:106308]

                let intro = txn.get_external(&v.introduced_by())?.unwrap().into();

[6.106225]

[6.106308]

                let intro = txn.get_external(&v.dest().change)?.unwrap().into();