conflicts

Dependencies

• [2] X7OHUPL5 Fixing a bug in unrecord, and fixing the tests
• [3] XSEODPNE Fixing conflicts
• [4] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [5] QQZNSB26 Permission update (after #X243)
• [6] HDGRZISM Version updates
• [7] 6HNRL5RT detect non-utf8 text files
• [8] UM5DLRPB store new non-UTF-8 files raw and decode to deplay the contents
• [9] Q3GU26WD merge with changes from sanakirja v1.1.2
• [10] NYOF5766 track file encoding in the record, including change text for file adds
• [11] YTQS4ES3 Fixing a parsing problem (related to permissions), and the associated permissions
• [12] X243Z3Y5 Recording only the required metadata (can even be changed later!)
• [13] VO5OQW4W Removing anyhow in libpijul

Change contents

• edit in libpijul/src/record.rs at line 11
  [4.489199]→[2.935:977](∅→∅)
  − use std::collections::{HashMap, HashSet};
• resolve name conflict: mod.rs (-xw-x--x--)mod.rs (-xw-x--x--)
  [4.768883]→[4.793238:793246](∅→∅),[4.768883]→[4.793238:793246](∅→∅)
• resurrect zombie in "Cargo.lock" at line 2117
  [3.1810]→[4.7494:7559](∅→∅),[4.7494]→[4.7494:7559](∅→∅),[4.7494]→[4.7494:7559](∅→∅)
  + source = "registry+https://github.com/rust-lang/crates.io-index"
• resurrect zombie in "Cargo.lock" at line 2119
  [3.1889]→[4.7637:7699](∅→∅),[4.7637]→[4.7637:7699](∅→∅),[4.7637]→[4.7637:7699](∅→∅)
  + dependencies = [

  + "fnv",

  + "lazy_static",

  + "nom",

  + "petgraph",