pmeunier/elpe - Change Z75Y46U5IA4PKK7P4SCP3LKCR6DIDI3R5E2MXL27CMCGRYUFJ2KAC

Fixing a conflict

Created by pmeunier yesterday at 15:18

Z75Y46U5IA4PKK7P4SCP3LKCR6DIDI3R5E2MXL27CMCGRYUFJ2KAC

Dependencies

In channels

main

Change contents

Replacement in src/container.rs at line 1 [2.44692]
B:BD[2.44692] → [3.164:206]
```
use crate::{find_files::*, mount, Error};
```
[2.44692]
[2.44735]
```
use crate::{Error, find_files::*, mount};
```

Insertion in src/container.rs at line 674 [2.44692]

[4.6456]

[2.60977]

            if libc::dup2(stdout_w, this_stdout) < 0 {
                return Err(std::io::Error::last_os_error().into());
            }
            if libc::dup2(stderr_w, this_stderr) < 0 {
                return Err(std::io::Error::last_os_error().into());
            }

Deletion in src/container.rs at line 754 [2.44692]

B:BD[4.6456] → [6.15121:15176]

∅:D[6.15176] → [5.520:602]

B:BD[5.520] → [5.520:602]

B:BD[5.602] → [6.15177:15232]

∅:D[6.15232] → [5.655:737]

B:BD[5.655] → [5.655:737]

            if libc::dup2(stdout_w, this_stdout) < 0 {
                return Err(std::io::Error::last_os_error().into());
            }
            if libc::dup2(stderr_w, this_stderr) < 0 {
                return Err(std::io::Error::last_os_error().into());
            }

Solving an order conflict in src/container.rs at line 754 [2.44692]
[2.63152]