Solving conflicts

pmeunier

Aug 2, 2021, 8:11 PM

3ZAS64J675LPNHM2X32RH45B4A2LGK7NAIFDGQBQLDDSZVWEBTIQC

Dependencies

• [2] KGN7KVLA Formatting
• [3] 2V33SO6I dont unwrap name() for RemoteRepo::LocalChannel
• [4] C5XGFNKI Simplify return type for remote get_id
• [5] IVLLXQ5Z Improved push/pull reporting
• [6] FE5ES6Q4 Stop pushing/pulling if the remote returns an error
• [7] A3RM526Y Integrating identity malleability
• [8] QU6T6J6W Use the change time in addition to the modified time when detecting untouched files (at least on Unix)
• [9] MU5GSJAW Partial push and pull (WARNING: breaks the existing protocol)
• [10] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [11] K6GWUOD5 Styling progress bars
• [12] 76PCXGML Pushing to, and pulling from the local repository

Change contents

• resurrect zombie in "pijul/src/remote/mod.rs" at line 419
  [6.1636]→[3.0:165](∅→∅),[6.1636]→[3.0:165](∅→∅)
  + let mut remote = if let Some(name) = self.name() {

  + txn.open_or_create_remote(id, name)?

  + } else {

  + return Ok(None);

  + };
• edit in pijul/src/remote/mod.rs at line 419
  [6.56888]

  [3.0]
  + let id = self.get_id(txn).await?;
• edit in pijul/src/remote/mod.rs at line 425
  [6.56888]→[4.221:263](∅→∅),[6.56888]→[4.221:263](∅→∅)
  − let id = self.get_id(txn).await?;
• resolve order conflict in pijul/src/remote/mod.rs at line 425
  [3.165]

  [6.56987]
• replacement in pijul/src/remote/mod.rs at line 483
  [5.11453]→[5.11453:11504](∅→∅)
  − let id = self.get_id(txn).await?.unwrap();
  [5.11453]

  [5.11504]
  + let id = self.get_id(txn).await?;
• edit in libpijul/src/working_copy/filesystem.rs at line 346
  [6.274]→[3.166:287](∅→∅)
  − let ctime =

  − std::time::SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(attr.ctime() as u64);
• resolve order conflict in libpijul/src/working_copy/filesystem.rs at line 346
  [2.121]

  [6.383]