Solve ordering conflicts

finchie

Aug 17, 2023, 4:36 AM

O2U2JAFVBHJYU4IDC7S5L4TCLE326CYWYF2OPHKTAMDTKPLISUNQC

Dependencies

• [2] DO2Y5TY5 Tag synchronisation
• [3] TI7PCK7J Update `pijul/src/main.rs` to use new identity management
• [4] JL4WKA5P Implement the Sanakirja concurrency model in a cross-process way
• [5] BNPSVXIC Friendlier progress bars
• [6] SLJ3OHD4 unrecord: show list of changes if none were given as arguments
• [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [8] EUZFFJSO Updating Pijul with the latest changes in Libpijul
• [9] ABQDWHNG Migrate from `pijul::repository` to `pijul-repository`
• [10] JUYSZJSH Migrate from `pijul::progress` to `pijul_interaction::progress`
• [11] L4JXJHWX pijul/*: reorganize imports and remove extern crate
• [12] 4RV7T4SR Migrate from `pijul::config` to `pijul-config`
• [*] YVA72CP2 Default feedback for the `pijul git` command

Change contents

• edit in pijul/src/main.rs at line 2
  [4.84222]

  [4.576]
  + mod identity;

  + mod remote;
• edit in pijul/src/main.rs at line 8
  [4.603]

  [14.0]
  + use clap::{ColorChoice, Parser};
• edit in pijul/src/main.rs at line 272
  [4.84234]→[3.0:14](∅→∅),[4.11620]→[4.84234:84246](∅→∅),[4.84234]→[4.84234:84246](∅→∅)
  − mod identity;

  − mod remote;
• resolve order conflict in pijul/src/main.rs at line 272
  [4.89853]
• edit in pijul/src/commands/unrecord.rs at line 4
  [4.871]

  [4.871]
  + use crate::remote::CS;

  +
• edit in pijul/src/commands/unrecord.rs at line 169
  [4.97638]→[4.2341:2341](∅→∅),[4.871]→[2.26157:26180](∅→∅)
  −

  − use crate::remote::CS;
• resolve order conflict in pijul/src/commands/unrecord.rs at line 169
  [4.97638]