ilyagr/pijul - Change 44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC

Fixing conflicts

Created by pmeunier on February 7, 2024

44SHUW5W6RMWYDF2RKYB77S3VVFXT4ALRXKRXGKBQTONXTQQZBQAC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/commands/reset.rs at line 115 [5.97650]
B:BD[4.7839] → [2.704:769]
BD:BD[4.7839] → [2.704:769]
```
                    std::thread::available_parallelism()?.get(),
```

Replacement in pijul/src/commands/reset.rs at line 126 [5.97650]

B:BD[6.4079] → [3.256:361]

                if !self.force && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap() {

[6.4079]

[3.361]

                if !self.force
                    && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap()
                {

Replacement in pijul/src/commands/reset.rs at line 280 [5.97650]

B:BD[3.474] → [3.474:662]

fn has_unrecorded_changes(txn: ArcTxn<MutTxn<()>>,
                          channel: ChannelRef<MutTxn<()>>,
                          repo: &Repository) -> Result<bool, anyhow::Error> {

[3.474]

[3.662]

fn has_unrecorded_changes(
    txn: ArcTxn<MutTxn<()>>,
    channel: ChannelRef<MutTxn<()>>,
    repo: &Repository,
) -> Result<bool, anyhow::Error> {

Replacement in pijul/src/commands/reset.rs at line 295 [5.97650]
B:BD[3.918] → [3.918:943]
```
        num_cpus::get(),
```
[3.918]
[3.943]
```
        std::thread::available_parallelism()?.get(),
```

Fixing conflicts

Dependencies

In channels

Change contents

Deletion in pijul/src/commands/reset.rs at line 115 [5.97650]

Replacement in pijul/src/commands/reset.rs at line 126 [5.97650]

Replacement in pijul/src/commands/reset.rs at line 280 [5.97650]

Replacement in pijul/src/commands/reset.rs at line 295 [5.97650]