Chasesomero/pijul - Change TVV36VDZBUE4ZW5HXX5H2RYY5RAQORGHRYBWGVGTARQXD2BNJMGAC

Solving conflicts

Created by pmeunier on February 20, 2026

TVV36VDZBUE4ZW5HXX5H2RYY5RAQORGHRYBWGVGTARQXD2BNJMGAC

Dependencies

In channels

main

Change contents

Deletion in pijul-identity/src/repair.rs at line 70 [7.56]

B:BD[12.433] → [14.0:62]

                    .create(config, false, true, use_keyring)

Deletion in pijul-identity/src/repair.rs at line 78 [7.56]
B:BD[16.317] → [18.0:0]
Deletion in pijul-identity/src/repair.rs at line 80 [7.56]
B:BD[12.517] → [16.318:318]
Solving an order conflict in pijul-identity/src/repair.rs at line 80 [7.56]
[15.1]
[7.4889]

Deletion in pijul-identity/src/repair.rs at line 105 [7.56]

B:BD[12.569] → [14.63:133]

                            .create(config, false, true, use_keyring)

Deletion in pijul-identity/src/repair.rs at line 113 [7.56]
B:BD[16.666] → [18.1:1]
Deletion in pijul-identity/src/repair.rs at line 327 [7.56]
B:BD[7.15595] → [14.135:135]
B:BD[7.15595] → [17.297:297]
Deletion in pijul-identity/src/create.rs at line 276 [7.28175]
B:BD[11.7839] → [14.136:161]
BD:BD[11.7839] → [14.136:161]
```
        no_prompt: bool,
```
Deletion in pijul-identity/src/create.rs at line 277 [7.28175]
B:BD[16.934] → [18.2:2]

Deletion in pijul-identity/src/create.rs at line 282 [7.28175]

B:BD[13.352] → [14.163:297]

            prompted_identity = self
                .prompt_changes(config, None, link_remote, use_keyring)
                .await?;

Deletion in pijul-core/src/working_copy/mod.rs at line 62 [2.198172]

B:BD[8.1098] → [9.0:92]

    fn touch(&self, _name: &str, _time: std::time::SystemTime) -> Result<(), Self::Error> {

Deletion in pijul-core/src/working_copy/memory.rs at line 2 [2.199222]
B:BD[2.199292] → [2.199292:199328]
```
use crate::pristine::InodeMetadata;
```
Insertion in pijul-core/src/working_copy/memory.rs at line 3 [2.199222]
[4.25059]
[6.0]
```
use crate::pristine::InodeMetadata;
```

Replacement in pijul-core/src/working_copy/memory.rs at line 173 [2.199222]

B:BD[2.204249] → [2.204249:204289]

B:BD[2.204289] → [19.9107:9140]

∅:D[19.9140] → [2.204330:204372]

B:BD[2.204330] → [2.204330:204372]

                Some(Inode::Directory {
                    children, ..
                }) => t = Some(children),

[2.204249]

[2.204372]

                Some(Inode::Directory { children, .. }) => t = Some(children),

Replacement in pijul-core/src/working_copy/memory.rs at line 200 [2.199222]

B:BD[2.205214] → [2.205214:205254]

B:BD[2.205254] → [19.9141:9174]

∅:D[19.9174] → [2.205295:205337]

B:BD[2.205295] → [2.205295:205337]

                Some(Inode::Directory {
                    children, ..
                }) => t = Some(children),

[2.205214]

[2.205337]

                Some(Inode::Directory { children, .. }) => t = Some(children),

Replacement in pijul-core/src/working_copy/memory.rs at line 294 [2.199222]

B:BD[9.309] → [9.309:378]

                ref mut meta,
                ref mut last_modified,

[9.309]

[9.378]

                meta,
                last_modified,

Deletion in pijul-core/src/working_copy/memory.rs at line 299 [2.199222]
B:BD[4.26787] → [19.9228:9276]
```
            Some(Inode::File { meta, .. }) => {
```
Solving an order conflict in pijul-core/src/working_copy/memory.rs at line 299 [2.199222]
[9.469]
[3.237]

Replacement in pijul-core/src/working_copy/memory.rs at line 302 [2.199222]

B:BD[9.506] → [9.506:575]

                ref mut meta,
                ref mut last_modified,

[9.506]

[9.575]

                meta,
                last_modified,

Deletion in pijul-core/src/working_copy/memory.rs at line 307 [2.199222]
B:BD[2.207710] → [19.9277:9330]
```
            Some(Inode::Directory { meta, .. }) => {
```
Solving an order conflict in pijul-core/src/working_copy/memory.rs at line 307 [2.199222]
[9.666]
[3.319]

Replacement in pijul-core/src/working_copy/memory.rs at line 319 [2.199222]

B:BD[5.538] → [9.667:740]

                ref mut contents,
                ref mut last_modified,

[5.538]

[9.740]

                contents,
                last_modified,

Deletion in pijul-core/src/working_copy/memory.rs at line 322 [2.199222]
B:BD[5.538] → [19.9331:9360]
```
                contents, ..
```
Solving an order conflict in pijul-core/src/working_copy/memory.rs at line 322 [2.199222]
[9.759]
[5.575]

Replacement in pijul-core/src/working_copy/memory.rs at line 351 [2.199222]

B:BD[8.1391] → [8.1391:1424]

B:BD[8.1424] → [19.9361:9392]

∅:D[19.9392] → [8.1463:1514]

B:BD[8.1463] → [8.1463:1514]

            if let Inode::File {
                last_modified,
                ..
            } = f
            {

[8.1391]

[8.1514]

            if let Inode::File { last_modified, .. } = f {

Deletion in pijul/src/commands/identity.rs at line 279 [7.40825]

B:BD[14.359] → [14.359:511]

B:BD[10.3099] → [16.1251:1312]

                        options.no_prompt,
                        !options.no_link,
                        !options.no_keyring,
                    )
                    .create(
                        config,

Solving an order conflict in pijul/src/commands/identity.rs at line 279 [7.40825]
[14.359]
[16.1312]

Solving conflicts

Dependencies

In channels

Change contents

Deletion in pijul-identity/src/repair.rs at line 70 [7.56]

Deletion in pijul-identity/src/repair.rs at line 78 [7.56]

Deletion in pijul-identity/src/repair.rs at line 80 [7.56]

Solving an order conflict in pijul-identity/src/repair.rs at line 80 [7.56]

Deletion in pijul-identity/src/repair.rs at line 105 [7.56]

Deletion in pijul-identity/src/repair.rs at line 113 [7.56]

Deletion in pijul-identity/src/repair.rs at line 327 [7.56]

Deletion in pijul-identity/src/create.rs at line 276 [7.28175]

Deletion in pijul-identity/src/create.rs at line 277 [7.28175]

Deletion in pijul-identity/src/create.rs at line 282 [7.28175]

Deletion in pijul-core/src/working_copy/mod.rs at line 62 [2.198172]

Deletion in pijul-core/src/working_copy/memory.rs at line 2 [2.199222]

Insertion in pijul-core/src/working_copy/memory.rs at line 3 [2.199222]

Replacement in pijul-core/src/working_copy/memory.rs at line 173 [2.199222]

Replacement in pijul-core/src/working_copy/memory.rs at line 200 [2.199222]

Replacement in pijul-core/src/working_copy/memory.rs at line 294 [2.199222]

Deletion in pijul-core/src/working_copy/memory.rs at line 299 [2.199222]

Solving an order conflict in pijul-core/src/working_copy/memory.rs at line 299 [2.199222]

Replacement in pijul-core/src/working_copy/memory.rs at line 302 [2.199222]

Deletion in pijul-core/src/working_copy/memory.rs at line 307 [2.199222]

Solving an order conflict in pijul-core/src/working_copy/memory.rs at line 307 [2.199222]

Replacement in pijul-core/src/working_copy/memory.rs at line 319 [2.199222]

Deletion in pijul-core/src/working_copy/memory.rs at line 322 [2.199222]

Solving an order conflict in pijul-core/src/working_copy/memory.rs at line 322 [2.199222]

Replacement in pijul-core/src/working_copy/memory.rs at line 351 [2.199222]

Deletion in pijul/src/commands/identity.rs at line 279 [7.40825]

Solving an order conflict in pijul/src/commands/identity.rs at line 279 [7.40825]