Solving a conflict

pmeunier

Nov 25, 2021, 5:31 PM

O4C7BPFX2YXYIDKXFYDCUAS4TJ5BJJIZNZQ7PMF7G5Z7R4KWWDMAC

Dependencies

• [2] FGIVSUFH Fixing conflicts with the new patch parsing code, and introducing AddRoot
• [3] 5FI6SBEZ Re-implement change printing and parsing
• [4] AF5AKUTO Cleanup after the text changes refactoring
• [5] VO5OQW4W Removing anyhow in libpijul
• [6] ZSF3YFZT encoded file deletion
• [7] XR7MNOMU file encoding in updates
• [8] RMDMAYRX Adding a root inode (aka supporting submodules)

Change contents

• edit in libpijul/src/change/text_changes.rs at line 555
  [3.28507]→[3.28507:28549](∅→∅),[3.28507]→[3.28507:28549](∅→∅),[3.28588]→[3.28588:28642](∅→∅),[3.28588]→[3.28588:28642](∅→∅),[3.28656]→[3.28656:28698](∅→∅),[3.28656]→[3.28656:28698](∅→∅),[3.28739]→[3.28739:28793](∅→∅),[3.28739]→[3.28739:28793](∅→∅)
  − Hunk::AddRoot { change } => {

  − write_atom(&mut w, hashes, &change)?;

  − Hunk::DelRoot { change } => {

  − write_atom(&mut w, hashes, &change)?;
• edit in libpijul/src/change/text_changes.rs at line 1146
  [3.88449]→[2.6078:6078](∅→∅)
  −