pijul/pijul - Change 4VNRGSPU57GYEUCB3CZHNMBCWSGJHQHO6HIWY6QLKK6O4HVP4CVAC

Fixing conflict editing

When editing both lines surrounding a conflict marker, we were computing the up context incorrectly, by forgetting that the lines immediately before a conflict marker weren't necessarily the first ones to be added to the current patch.

Created by pmeunier on December 28, 2025

4VNRGSPU57GYEUCB3CZHNMBCWSGJHQHO6HIWY6QLKK6O4HVP4CVAC

Dependencies

In channels

main

Change contents

Insertion in libpijul/src/diff/replace.rs at line 142 [3.779907]

[3.783747]

[3.783788]

    // Move up until we find a "suitable" line (possibly jumping over
    // conflict markers, which aren't "suitable").

Replacement in libpijul/src/diff/replace.rs at line 153 [3.779907]

B:BD[3.784217] → [3.784217:784302]

                return vec![diff.pos_a[up_context_idx].vertex.end_pos().to_option()]

[3.784217]

[3.784302]

                return vec![diff.pos_a[up_context_idx].vertex.end_pos().to_option()];

Insertion in libpijul/src/diff/replace.rs at line 206 [3.779907]
[3.785842]
[3.785897]
Insertion in libpijul/src/diff/replace.rs at line 251 [3.779907]
[3.787585]
[3.787640]
Replacement in libpijul/src/diff/replace.rs at line 262 [3.779907]
B:BD[3.787868] → [3.787868:787893]
```
    contents_len: usize,
```
[3.787868]
[3.787893]
```
    current_contents_len: usize,
```
Insertion in libpijul/src/diff/replace.rs at line 287 [3.779907]
[3.788890]
[3.788890]
```
                    current_contents_len,
```
Replacement in libpijul/src/diff/replace.rs at line 289 [3.779907]
B:BD[3.788928] → [3.788928:788946]
```
                )
```
[3.788928]
[3.788946]
```
                );
```

Replacement in libpijul/src/diff/replace.rs at line 301 [3.779907]

B:BD[3.789512] → [2.135941:136018]

                e.push(ChangePosition((contents_len + b_len_bytes).into()));

[3.789512]

[3.789589]

                e.push(ChangePosition((current_contents_len + b_len_bytes).into()));

Replacement in libpijul/src/diff/replace.rs at line 319 [3.779907]

B:BD[3.790431] → [3.790431:790527]

                            return vec![diff.position(down_context_idx, pos_bytes).to_option()]

[3.790431]

[3.790527]

                            return vec![diff.position(down_context_idx, pos_bytes).to_option()];

Insertion in libpijul/src/diff/replace.rs at line 332 [3.779907]
[3.790679]
[3.790734]
Insertion in libpijul/src/diff/replace.rs at line 341 [3.779907]
[3.790924]
[3.790924]
```
    current_contents_len: usize,
```

Replacement in libpijul/src/diff/replace.rs at line 347 [3.779907]

B:BD[3.791113] → [3.791113:791147]

B:BD[3.791147] → [2.136019:136080]

    conflict_contexts
        .up
        .insert(conflict, ChangePosition(len_bytes.into()));

[3.791113]

[3.791208]

    debug!("len_bytes {:?}", len_bytes);
    conflict_contexts.up.insert(
        conflict,
        ChangePosition((current_contents_len + len_bytes).into()),
    );

Fixing conflict editing

Dependencies

In channels

Change contents

Insertion in libpijul/src/diff/replace.rs at line 142 [3.779907]

Replacement in libpijul/src/diff/replace.rs at line 153 [3.779907]

Insertion in libpijul/src/diff/replace.rs at line 206 [3.779907]

Insertion in libpijul/src/diff/replace.rs at line 251 [3.779907]

Replacement in libpijul/src/diff/replace.rs at line 262 [3.779907]

Insertion in libpijul/src/diff/replace.rs at line 287 [3.779907]

Replacement in libpijul/src/diff/replace.rs at line 289 [3.779907]

Replacement in libpijul/src/diff/replace.rs at line 301 [3.779907]

Replacement in libpijul/src/diff/replace.rs at line 319 [3.779907]

Insertion in libpijul/src/diff/replace.rs at line 332 [3.779907]

Insertion in libpijul/src/diff/replace.rs at line 341 [3.779907]

Replacement in libpijul/src/diff/replace.rs at line 347 [3.779907]