pijul/pijul - Change BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC

Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)

Created by pmeunier on January 27, 2021

BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC

Dependencies

In channels

main

In discussions

#301 Fix tests compilation failures

#333 Typo in help output

Change contents

Insertion in libpijul/src/pristine/sanakirja.rs at line 1337 [3.531056]
[2.45598]
[2.45598]
```
        assert!(pos > key.start);
        assert!(pos < key.end);
```

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

[4.45]

[3.782161]

        if start <= end {
            return
        }

Deletion in libpijul/src/change/text_changes.rs at line 432 [5.37976]
B:BD[5.53313] → [5.53313:53356]
```
                        writeln!(w, "\\")?
```
Insertion in libpijul/src/change/text_changes.rs at line 432 [5.37976]
[5.53313]
[5.53356]
```
                        writeln!(w, "\n\\")?
```
Deletion in libpijul/src/change/text_changes.rs at line 1236 [5.37976]
B:BD[5.85615] → [5.85615:85650]
```
                writeln!(w, "\\")?
```
Insertion in libpijul/src/change/text_changes.rs at line 1236 [5.37976]
[5.85615]
[5.85650]
```
                writeln!(w, "\n\\")?
```

Insertion in libpijul/src/apply.rs at line 414 [3.944089]

[3.955847]

    if txn.find_block_end(graph, vertex.end_pos()).is_ok()
        || txn.find_block(graph, vertex.start_pos()).is_ok() {
            error!("Invalid change: {:?}", vertex);
            return Err(LocalApplyError::InvalidChange);
        }

Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)

Dependencies

In channels

In discussions

Change contents

Insertion in libpijul/src/pristine/sanakirja.rs at line 1337 [3.531056]

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

Deletion in libpijul/src/change/text_changes.rs at line 432 [5.37976]

Insertion in libpijul/src/change/text_changes.rs at line 432 [5.37976]

Deletion in libpijul/src/change/text_changes.rs at line 1236 [5.37976]

Insertion in libpijul/src/change/text_changes.rs at line 1236 [5.37976]

Insertion in libpijul/src/apply.rs at line 414 [3.944089]