Fixing conflicts

pmeunier

Feb 22, 2023, 5:46 PM

UGUWKK3IRZQJFGHOUMW2BWN42PZUS7TZL7X442XXDGQUB3FWW3NQC

Dependencies

• [2] FMVDQHHC Parsing binary file deletions in the change text format
• [3] YQMLICLW Fix the hunk_roundtrip test, simplify code, improve test coverage, fix some edge cases.
• [4] 5FI6SBEZ Re-implement change printing and parsing
• [5] HW7DZ2B4 Fixing the change parser

Change contents

• resurrect zombie in libpijul/src/change/parse.rs at line 68
  [4.115]→[2.0:142](∅→∅),[4.115]→[2.0:142](∅→∅)
  + let (i, contents) = if encoding.is_none() {

  + (i, Vec::new())

  + } else {

  + parse_contents('-', encoding.clone(), i)?

  + };
• edit in libpijul/src/change/parse.rs at line 68
  [4.66660]

  [2.0]
  + let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;
• edit in libpijul/src/change/parse.rs at line 74
  [4.66660]→[3.884:969](∅→∅),[4.66660]→[3.884:969](∅→∅)
  − let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;
• resolve order conflict in libpijul/src/change/parse.rs at line 74
  [2.142]

  [4.66773]