Chasesomero/pijul - Change VQCREHLR6QSS3CWTCWIMSX7OYEJAU75XDXHPTO2MHEKYJCCXSJQQC

Resolve conflicts in identity creation

Created by berkus on February 16, 2026

VQCREHLR6QSS3CWTCWIMSX7OYEJAU75XDXHPTO2MHEKYJCCXSJQQC

Dependencies

In channels

main

Change contents

Insertion in pijul-identity/src/repair.rs at line 1 [2.56]
[2.56]
[10.2615]
```
use crate::create::CreateParams;
```

Replacement in pijul-identity/src/repair.rs at line 70 [2.56]

B:BD[12.433] → [12.433:488]

                    .create(config, true, use_keyring)

[12.433]

[12.488]

                    .create(
                        config,
                        CreateParams {
                            no_prompt: false,
                            link_remote: true,
                            use_keyring,
                        },
                    )

Deletion in pijul-identity/src/repair.rs at line 79 [2.56]
B:BD[2.4220] → [13.0:65]
BD:BD[2.4220] → [13.0:65]
```
                old_identity.clone().create(false, true).await?;
```
Solving an order conflict in pijul-identity/src/repair.rs at line 79 [2.56]
[12.517]
[2.4889]

Replacement in pijul-identity/src/repair.rs at line 104 [2.56]

B:BD[12.569] → [12.569:632]

                            .create(config, true, use_keyring)

[12.569]

[12.632]

                            .create(
                                config,
                                CreateParams {
                                    no_prompt: false,
                                    link_remote: true,
                                    use_keyring,
                                },
                            )

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

B:BD[2.6256] → [13.66:139]

                        Complete::default()?.create(false, true).await?;

Solving an order conflict in pijul-identity/src/repair.rs at line 113 [2.56]
[12.669]
[2.6333]
Insertion in pijul-identity/src/lib.rs at line 41 [2.15627]
[2.16968]
[3.1919]
```
pub use create::CreateParams;
```

Insertion in pijul-identity/src/create.rs at line 14 [2.28175]

[2.28954]

pub struct CreateParams {
    pub no_prompt: bool,
    pub link_remote: bool,
    pub use_keyring: bool,
}

Replacement in pijul-identity/src/create.rs at line 272 [2.28175]

∅:D[10.7759] → [2.38441:38529]

B:BD[2.38441] → [2.38441:38529]

    /// * `link_remote` - Override if the identity should be exchanged with the remote.

[10.7759]

[10.7760]

    /// * `params.link_remote` - Override if the identity should be exchanged with the remote.

Replacement in pijul-identity/src/create.rs at line 276 [2.28175]
B:BD[10.7839] → [10.7839:7866]
B:BD[10.7866] → [12.1728:1755]
```
        link_remote: bool,
        use_keyring: bool,
```
[10.7839]
[10.7866]
```
        params: CreateParams,
```

Deletion in pijul-identity/src/create.rs at line 278 [2.28175]

B:BD[2.38529] → [13.140:238]

    pub async fn create(&self, no_prompt: bool, link_remote: bool) -> Result<(), anyhow::Error> {

Solving an order conflict in pijul-identity/src/create.rs at line 278 [2.28175]
[10.7903]
[3.14019]

Deletion in pijul-identity/src/create.rs at line 279 [2.28175]

B:BD[3.14076] → [12.1756:1883]

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

Replacement in pijul-identity/src/create.rs at line 280 [2.28175]

B:BD[13.270] → [13.270:318]

        let confirmed_identity = if no_prompt {

[13.270]

[13.318]

        let confirmed_identity = if params.no_prompt {

Replacement in pijul-identity/src/create.rs at line 283 [2.28175]

B:BD[13.352] → [13.352:431]

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

[13.352]

[13.431]

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

Replacement in pijul/src/commands/identity.rs at line 4 [2.40825]

∅:D[10.13454] → [7.3927:4015]

B:BD[4.1254] → [7.3927:4015]

use pijul_identity::{self as identity, Complete, choose_identity_name, fix_identities};

[10.13420]

[6.549]

use pijul_identity::{
    self as identity, Complete, CreateParams, choose_identity_name, fix_identities,
};

Replacement in pijul/src/commands/identity.rs at line 277 [2.40825]

B:BD[9.3099] → [12.2567:2642]

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

[9.3099]

[9.3166]

                    .create(
                        config,
                        CreateParams {
                            link_remote: !options.no_link,
                            use_keyring: !options.no_keyring,
                            no_prompt: options.no_prompt,
                        },
                    )

Deletion in pijul/src/commands/identity.rs at line 286 [2.40825]
B:BD[9.3195] → [12.2643:2643]
B:BD[2.49307] → [13.474:551]
```
                identity.create(options.no_prompt, !options.no_link).await?;
```
Solving an order conflict in pijul/src/commands/identity.rs at line 286 [2.40825]
[9.3195]
[5.1971]
Resurrecting zombie bytes in pijul/src/commands/identity.rs at line 509 [2.40825]
∅:∅[12.3372] → [9.4559:4579]
B:B[9.4559] → [9.4559:4579]
BD:B[9.4559] → [9.4559:4579]
```
                )?;
```
Replacement in pijul/src/commands/identity.rs at line 510 [2.40825]
B:BD[9.4579] → [12.3373:3373]
BD:BD[9.4579] → [12.3373:3373]
[9.4579]
[11.1954]

Replacement in libpijul/src/working_copy/mod.rs at line 51 [14.198172]

B:BD[8.1098] → [8.1098:1189]

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

[8.1098]

[8.1189]

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

Resolve conflicts in identity creation

Dependencies

In channels

Change contents

Insertion in pijul-identity/src/repair.rs at line 1 [2.56]

Replacement in pijul-identity/src/repair.rs at line 70 [2.56]

Deletion in pijul-identity/src/repair.rs at line 79 [2.56]

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

Replacement in pijul-identity/src/repair.rs at line 104 [2.56]

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

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

Insertion in pijul-identity/src/lib.rs at line 41 [2.15627]

Insertion in pijul-identity/src/create.rs at line 14 [2.28175]

Replacement in pijul-identity/src/create.rs at line 272 [2.28175]

Replacement in pijul-identity/src/create.rs at line 276 [2.28175]

Deletion in pijul-identity/src/create.rs at line 278 [2.28175]

Solving an order conflict in pijul-identity/src/create.rs at line 278 [2.28175]

Deletion in pijul-identity/src/create.rs at line 279 [2.28175]

Replacement in pijul-identity/src/create.rs at line 280 [2.28175]

Replacement in pijul-identity/src/create.rs at line 283 [2.28175]

Replacement in pijul/src/commands/identity.rs at line 4 [2.40825]

Replacement in pijul/src/commands/identity.rs at line 277 [2.40825]

Deletion in pijul/src/commands/identity.rs at line 286 [2.40825]

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

Resurrecting zombie bytes in pijul/src/commands/identity.rs at line 509 [2.40825]

Replacement in pijul/src/commands/identity.rs at line 510 [2.40825]

Replacement in libpijul/src/working_copy/mod.rs at line 51 [14.198172]