Conflict resolution

pmeunier

Jul 11, 2021, 10:50 AM

MSS22PSNBOY3EPKD4KCT4S2MX3SQD3QZ2KN4I5DE5WABZGJXTG2QC

Dependencies

• [2] SHSJ3Y53 Fixing more tests
• [3] 3S6LU2U5 abstract out FileMetadata (de)serialistion
• [4] ADPAFSMY Proper old metadata when recording
• [5] I24UEJQL Various post-fire fixes
• [6] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
• [7] TVVW53HZ Conflict resolution
• [8] TIPZ7UXN Started fixing the tests for parallel record/output
• [9] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).

Change contents

• edit in libpijul/src/tests/mod.rs at line 28
  [3.22202]→[2.866:866](∅→∅)
  −
• edit in libpijul/src/record.rs at line 915
  [3.60119]→[3.1580:1580](∅→∅)
  −