Solving a conflict

pmeunier

Feb 23, 2023, 9:18 AM

HODZ2KUFCFSNV75KD7PP6CYLAD4XPY62DWVCAOKMOJTM65MHJSVQC

Dependencies

• [2] YQMLICLW Fix the hunk_roundtrip test, simplify code, improve test coverage, fix some edge cases.
• [3] OOJNAY34 allow LF or CRLF when parsing change headers
• [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 122
  [4.68289]→[2.1056:1123](∅→∅),[4.68289]→[2.1056:1123](∅→∅)
  + let (i, contents) = parse_contents('+', encoding.clone(), i)?;
• edit in libpijul/src/change/parse.rs at line 122
  [4.68198]

  [2.1056]
  + let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;
• edit in libpijul/src/change/parse.rs at line 124
  [4.68198]→[3.308:403](∅→∅),[4.68198]→[3.308:403](∅→∅)
  − let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;
• resolve order conflict in libpijul/src/change/parse.rs at line 124
  [2.1123]

  [4.68356]