pijul/sanakirja - Change EDV5MXDNBK66EOXKMLJQO4MG3C7ZQ4G6W36BTCBCNW3WUNP7QVAAC

Conflict resolution

Created by pmeunier on October 13, 2024

EDV5MXDNBK66EOXKMLJQO4MG3C7ZQ4G6W36BTCBCNW3WUNP7QVAAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in sanakirja/src/environment/mod.rs at line 401 [5.91606]

B:B[4.403] → [3.19:256]

BD:B[4.403] → [3.19:256]

    if let Err(err) = file.allocate(length) {
        let code = err.raw_os_error().unwrap();
        if code == libc::EINVAL {
            Ok(())
        } else {
            Err(err.into())
        }
    } else {
        Ok(())
    }

Deletion in sanakirja/src/environment/mod.rs at line 412 [5.91606]
B:BD[4.529] → [4.529:540]
```
    Ok(())
```
Replacement in sanakirja/Cargo.toml at line 23 [5.108411]
B:BD[7.7059] → [2.883:911]
B:BD[7.7059] → [3.257:292]
```
mmap = [ "memmap2", "fs2" ]
mmap = [ "memmap", "fs4", "libc" ]
```
[7.7059]
[8.651]
```
mmap = [ "memmap2", "fs4", "libc" ]
```
Resurrecting zombie bytes in sanakirja/Cargo.toml at line 32 [5.108411]
B:B[9.84] → [2.912:1026]
BD:B[9.84] → [2.912:1026]
```
sanakirja-core = { path = "../sanakirja-core", version = "1.4.1" }
memmap2 = { version = "0.9", optional = true }
```
Resurrecting zombie bytes in sanakirja/Cargo.toml at line 34 [5.108411]
B:B[10.5574] → [3.293:381]
BD:B[10.5574] → [3.293:381]
```
fs4 = { version = "0.6.3", optional = true }
libc = {version = "0.2", optional = true }
```
Solving an order conflict in sanakirja/Cargo.toml at line 34 [5.108411]
[2.1026]
[3.293]

Conflict resolution

Dependencies

In channels

Change contents

Resurrecting zombie bytes in sanakirja/src/environment/mod.rs at line 401 [5.91606]

Deletion in sanakirja/src/environment/mod.rs at line 412 [5.91606]

Replacement in sanakirja/Cargo.toml at line 23 [5.108411]

Resurrecting zombie bytes in sanakirja/Cargo.toml at line 32 [5.108411]

Resurrecting zombie bytes in sanakirja/Cargo.toml at line 34 [5.108411]

Solving an order conflict in sanakirja/Cargo.toml at line 34 [5.108411]