ilyagr/pijul - Change 352WW5FPLUBGEHM7W5WF7N7AMO56LPLL4WSR44VIPCSZVQRDLN4AC

Matches https://github.com/ilyagr/pijul-clone as of now, might become out of sync

Fixing a bug when deleting conflict resolutions

Created by pmeunier on May 11, 2021

352WW5FPLUBGEHM7W5WF7N7AMO56LPLL4WSR44VIPCSZVQRDLN4AC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/diff/delete.rs at line 22 [4.805350]
∅:D[3.408] → [4.806025:806059]
∅:D[2.116493] → [4.806025:806059]
B:BD[4.806025] → [4.806025:806059]
```
        debug!("delete {:?}", r);
```
[2.116493]
[2.116494]
```
        debug!("delete {:?}: {:?}", r, d[r]);
```

Replacement in libpijul/src/diff/delete.rs at line 101 [4.805350]

B:BD[4.808811] → [4.808811:808868]

    let first_vertex = diff.last_vertex_containing(pos);

[4.808811]

[4.808927]

    let first_vertex = diff.first_vertex_containing(pos).max(1);
    debug!("first_vertex = {:?}, vertex = {:?}", first_vertex, diff.pos_a[first_vertex].vertex);