Solving conflicts

pmeunier

Feb 20, 2026, 10:12 AM

TVV36VDZBUE4ZW5HXX5H2RYY5RAQORGHRYBWGVGTARQXD2BNJMGAC

Dependencies

• [2] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [3] X7OHUPL5 Fixing a bug in unrecord, and fixing the tests
• [4] I24UEJQL Various post-fire fixes
• [5] RRCSHAYZ Formatting
• [6] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
• [7] 4KJ45IJL Implement new identity management
• [8] 7FP2DFNX Optimisation: avoid re-checking the entire repo when recording after an unrecord
• [9] 7E6A6PZO Fixing the working copy timing test
• [10] MBIKZPCC Add flags to disable the use of the system keyring, asking to prompt the key password directly instead
• [11] YW6NICQV Migrate codebase to refactored `pijul_config` crate
• [12] 7JTKP74V Fixing a conflict
• [13] ZPLT3HRL Fix error in identity new by skipping any prompting when no-prompt is set
• [14] UMCUSKIV Fixing conflicts
• [15] 466C7J7E Solving a conflict
• [16] VQCREHLR Resolve conflicts in identity creation
• [17] BWR2D2HJ Resolve conflict-order hunks
• [18] 6JKPLWMV Resolve hunk order conflicts
• [19] 4USQK3IW Big rename: libpijul => pijul-core, to match all other crates in the ecosystem
• [20] VO5OQW4W Removing anyhow in libpijul
• [21] MOPABMFW Fixing a deadlock in working_copy::memory (used only in tests for now)
• [22] LPM4PBYJ More precise API for working copy in record and output

Change contents

• edit in pijul-identity/src/repair.rs at line 70
  [12.433]→[14.0:62](∅→∅)
  − .create(config, false, true, use_keyring)
• edit in pijul-identity/src/repair.rs at line 78
  [16.317]→[18.0:0](∅→∅)
  −
• edit in pijul-identity/src/repair.rs at line 80
  [12.517]→[16.318:318](∅→∅)
  −
• resolve order conflict in pijul-identity/src/repair.rs at line 80
  [15.1]

  [7.4889]
• edit in pijul-identity/src/repair.rs at line 105
  [12.569]→[14.63:133](∅→∅)
  − .create(config, false, true, use_keyring)
• edit in pijul-identity/src/repair.rs at line 113
  [16.666]→[18.1:1](∅→∅)
  −
• edit in pijul-identity/src/repair.rs at line 327
  [7.15595]→[14.135:135](∅→∅),[7.15595]→[17.297:297](∅→∅)
  −

  −
• edit in pijul-identity/src/create.rs at line 276
  [11.7839]→[14.136:161](∅→∅),[11.7839]→[14.136:161](∅→∅)
  − no_prompt: bool,
• edit in pijul-identity/src/create.rs at line 277
  [16.934]→[18.2:2](∅→∅)
  −
• edit in pijul-identity/src/create.rs at line 282
  [13.352]→[14.163:297](∅→∅)
  − prompted_identity = self

  − .prompt_changes(config, None, link_remote, use_keyring)

  − .await?;
• edit in pijul-core/src/working_copy/mod.rs at line 62
  [8.1098]→[9.0:92](∅→∅)
  − fn touch(&self, _name: &str, _time: std::time::SystemTime) -> Result<(), Self::Error> {
• edit in pijul-core/src/working_copy/memory.rs at line 2
  [2.199292]→[2.199292:199328](∅→∅)
  − use crate::pristine::InodeMetadata;
• edit in pijul-core/src/working_copy/memory.rs at line 3
  [4.25059]

  [6.0]
  + use crate::pristine::InodeMetadata;
• replacement in pijul-core/src/working_copy/memory.rs at line 173
  [2.204249]→[2.204249:204289](∅→∅),[2.204289]→[19.9107:9140](∅→∅),[19.9140]→[2.204330:204372](∅→∅),[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.205214]→[2.205214:205254](∅→∅),[2.205254]→[19.9141:9174](∅→∅),[19.9174]→[2.205295:205337](∅→∅),[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
  [9.309]→[9.309:378](∅→∅)
  − ref mut meta,

  − ref mut last_modified,
  [9.309]

  [9.378]
  + meta,

  + last_modified,
• edit in pijul-core/src/working_copy/memory.rs at line 299
  [4.26787]→[19.9228:9276](∅→∅)
  − Some(Inode::File { meta, .. }) => {
• resolve order conflict in pijul-core/src/working_copy/memory.rs at line 299
  [9.469]

  [3.237]
• replacement in pijul-core/src/working_copy/memory.rs at line 302
  [9.506]→[9.506:575](∅→∅)
  − ref mut meta,

  − ref mut last_modified,
  [9.506]

  [9.575]
  + meta,

  + last_modified,
• edit in pijul-core/src/working_copy/memory.rs at line 307
  [2.207710]→[19.9277:9330](∅→∅)
  − Some(Inode::Directory { meta, .. }) => {
• resolve order conflict in pijul-core/src/working_copy/memory.rs at line 307
  [9.666]

  [3.319]
• replacement in pijul-core/src/working_copy/memory.rs at line 319
  [5.538]→[9.667:740](∅→∅)
  − ref mut contents,

  − ref mut last_modified,
  [5.538]

  [9.740]
  + contents,

  + last_modified,
• edit in pijul-core/src/working_copy/memory.rs at line 322
  [5.538]→[19.9331:9360](∅→∅)
  − contents, ..
• resolve order conflict in pijul-core/src/working_copy/memory.rs at line 322
  [9.759]

  [5.575]
• replacement in pijul-core/src/working_copy/memory.rs at line 351
  [8.1391]→[8.1391:1424](∅→∅),[8.1424]→[19.9361:9392](∅→∅),[19.9392]→[8.1463:1514](∅→∅),[8.1463]→[8.1463:1514](∅→∅)
  − if let Inode::File {

  − last_modified,

  − ..

  − } = f

  − {
  [8.1391]

  [8.1514]
  + if let Inode::File { last_modified, .. } = f {
• edit in pijul/src/commands/identity.rs at line 279
  [14.359]→[14.359:511](∅→∅),[10.3099]→[16.1251:1312](∅→∅)
  − options.no_prompt,

  − !options.no_link,

  − !options.no_keyring,

  − )

  − .create(

  − config,
• resolve order conflict in pijul/src/commands/identity.rs at line 279
  [14.359]

  [16.1312]