[local] conflict

dblsaiko

Mar 31, 2024, 11:53 PM

D2HVT34C5ZTLJB4OWKWMP6MBHGT5NID4VTMIE2Y3YEZ4XRYZE77AC

Dependencies

• [2] 67GIAQEU Handle named remotes in pijul remote and remote delete
• [3] OSWFAKWM Refactor push/pull commands' handling of repo and channel
• [4] 3KRGVQFU Do not update the mtime of unmodified files
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [6] L4JXJHWX pijul/*: reorganize imports and remove extern crate
• [7] 6ZPDI7QG pull uses None as the base case path when outputing repo
• [8] LGEJSLTY Fixing output (including its uses in reset and pull)
• [9] X243Z3Y5 Recording only the required metadata (can even be changed later!)

Change contents

• resurrect zombie in pijul/src/commands/pushpull.rs at line 1
  [4.111631]→[2.348:444](∅→∅),[4.111631]→[2.348:444](∅→∅)
  + use std::collections::{BTreeMap, BTreeSet, HashSet};

  + use std::io;

  + use std::io::{Stdout, Write};