Resolve hunk order conflicts

berkus

Feb 16, 2026, 11:27 PM

6JKPLWMV6NDT3BJ2ZZSCXE3ODFSS233ASM4QHRQNUB2IGFX7PPFQC

Dependencies

• [2] MBIKZPCC Add flags to disable the use of the system keyring, asking to prompt the key password directly instead
• [3] YW6NICQV Migrate codebase to refactored `pijul_config` crate
• [4] 7JTKP74V Fixing a conflict
• [5] ZPLT3HRL Fix error in identity new by skipping any prompting when no-prompt is set
• [6] VQCREHLR Resolve conflicts in identity creation
• [7] BWR2D2HJ Resolve conflict-order hunks
• [8] 4KJ45IJL Implement new identity management
• [9] 4OJWMSOW Fully replace crate::Identity
• [10] 5Z2Y7VGV Migrate `pijul::identity::Complete::prove` to `pijul::remote::prove`
• [11] WTPFQPO5 Add global `no_prompt` flag

Change contents

• edit in pijul-identity/src/repair.rs at line 78
  [4.433]→[7.162:224](∅→∅)
  − .create(config, true, use_keyring, false)
• resolve order conflict in pijul-identity/src/repair.rs at line 78
  [6.317]

  [4.488]
• edit in pijul-identity/src/repair.rs at line 112
  [4.569]→[7.225:295](∅→∅)
  − .create(config, true, use_keyring, false)
• resolve order conflict in pijul-identity/src/repair.rs at line 112
  [6.666]

  [4.632]
• edit in pijul-identity/src/repair.rs at line 113
  [4.669]→[6.667:667](∅→∅),[4.669]→[7.296:296](∅→∅)
  −

  −
• edit in pijul-identity/src/create.rs at line 277
  [4.1755]→[7.0:25](∅→∅),[4.1755]→[7.0:25](∅→∅)
  − no_prompt: bool,
• resolve order conflict in pijul-identity/src/create.rs at line 277
  [6.934]

  [3.7866]
• edit in pijul-identity/src/create.rs at line 278
  [3.7903]→[6.935:935](∅→∅),[3.7903]→[6.935:935](∅→∅),[3.7903]→[7.26:26](∅→∅)
  −

  −
• edit in pijul-identity/src/create.rs at line 284
  [6.1115]→[6.1115:1140](∅→∅),[5.352]→[7.27:136](∅→∅)
  − .await?;

  − prompted_identity = self

  − .prompt_changes(config, None, link_remote, use_keyring)
• resolve order conflict in pijul-identity/src/create.rs at line 284
  [6.1115]

  [7.136]
• edit in pijul/src/commands/identity.rs at line 284
  [6.1557]→[6.1557:1579](∅→∅),[2.3099]→[7.298:489](∅→∅)
  − )

  − .create(

  − config,

  − !options.no_link,

  − !options.no_keyring,

  − options.no_prompt,
• resolve order conflict in pijul/src/commands/identity.rs at line 284
  [6.1557]

  [7.489]
• edit in pijul/src/commands/identity.rs at line 286
  [2.3195]→[6.1580:1580](∅→∅),[2.3195]→[7.512:512](∅→∅)
  −

  −