dblsaiko/pijul - Change 3ZAS64J675LPNHM2X32RH45B4A2LGK7NAIFDGQBQLDDSZVWEBTIQC

Solving conflicts

Created by pmeunier on August 2, 2021

3ZAS64J675LPNHM2X32RH45B4A2LGK7NAIFDGQBQLDDSZVWEBTIQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in "pijul/src/remote/mod.rs" at line 419 [7.52474]

B:B[6.1636] → [3.0:165]

BD:B[6.1636] → [3.0:165]

        let mut remote = if let Some(name) = self.name() {
            txn.open_or_create_remote(id, name)?
        } else {
            return Ok(None);
        };

Insertion in pijul/src/remote/mod.rs at line 419 [7.52474]
[7.56888]
[3.0]
```
        let id = self.get_id(txn).await?;
```
Deletion in pijul/src/remote/mod.rs at line 425 [7.52474]
B:BD[7.56888] → [4.221:263]
BD:BD[7.56888] → [4.221:263]
```
        let id = self.get_id(txn).await?;
```
Solving an order conflict in pijul/src/remote/mod.rs at line 425 [7.52474]
[3.165]
[7.56987]
Replacement in pijul/src/remote/mod.rs at line 483 [7.52474]
B:BD[5.11453] → [5.11453:11504]
```
        let id = self.get_id(txn).await?.unwrap();
```
[5.11453]
[5.11504]
```
        let id = self.get_id(txn).await?;
```

Deletion in libpijul/src/working_copy/filesystem.rs at line 346 [7.208900]

B:BD[8.274] → [3.166:287]

        let ctime =
            std::time::SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(attr.ctime() as u64);

Solving an order conflict in libpijul/src/working_copy/filesystem.rs at line 346 [7.208900]
[2.121]
[8.383]

Solving conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in "pijul/src/remote/mod.rs" at line 419 [7.52474]

Insertion in pijul/src/remote/mod.rs at line 419 [7.52474]

Deletion in pijul/src/remote/mod.rs at line 425 [7.52474]

Solving an order conflict in pijul/src/remote/mod.rs at line 425 [7.52474]

Replacement in pijul/src/remote/mod.rs at line 483 [7.52474]

Deletion in libpijul/src/working_copy/filesystem.rs at line 346 [7.208900]

Solving an order conflict in libpijul/src/working_copy/filesystem.rs at line 346 [7.208900]