Fixing a conflict

pmeunier

Feb 7, 2024, 4:56 PM

PBNQKKPEFRII3QC62XURYOOTCXMIO2TMV3RBIHRCBIG3SHSVE7PAC

Dependencies

• [2] AAAMZY4V Updating `pijul git` with the latest Sanakirja
• [3] RIZ4IP76 Solving more conflicts
• [4] USQMBKTP Replace deprecated chrono function
• [5] RH7NSV7F Bump lockfile
• [6] VCYKNPDK More conflicts?
• [7] PNJL5TPZ Version bump
• [8] 5IABX6JG Fix deprecation warning for from_utc
• [9] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [10] GUL4M5FI Cleanup and formatting
• [11] NEJOYVJB Fixing the Git feature
• [*] EJ7TFFOW Re-adding Cargo.lock

Change contents

• edit in pijul/src/commands/git.rs at line 764
  [4.1476]→[2.314:382](∅→∅)
  − timestamp: chrono::DateTime::from_naive_utc_and_offset(
• resurrect zombie in Cargo.lock at line 253
  [4.121]→[3.2224:2302](∅→∅),[4.121]→[3.2224:2302](∅→∅)
  + checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
• resurrect zombie in Cargo.lock at line 255
  [4.216]→[3.2303:2361](∅→∅),[4.216]→[3.2303:2361](∅→∅)
  + "async-io 1.13.0",

  + "async-lock 2.8.0",

  + "async-signal",
• resurrect zombie in Cargo.lock at line 260
  [4.280]→[3.2362:2430](∅→∅),[4.280]→[3.2362:2430](∅→∅)
  + "event-listener 3.1.0",

  + "futures-lite 1.13.0",

  + "rustix 0.38.31",