Fixing a conflict

pmeunier

May 15, 2025, 10:20 AM

VLCNZIBODPYJHMDBJLFLSNERVAHLD4EFKPRP7FW75J7YMIDGYSUAC

Dependencies

• [2] XGH2A4BO Formatting/Cleanup
• [3] QWIYNMI5 Formatting + big-endian Sanakirja
• [4] RRCSHAYZ Formatting
• [5] I24UEJQL Various post-fire fixes
• [6] OXZVZDQZ Simplification of missing context repairs
• [7] 6YMDOZIB Refactoring apply
• [8] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [9] 2RXOCWUW Making libpijul deterministic (and getting rid of `rand`)
• [10] HP7CKJIW Fixing a bug in unrecord
• [11] 3CFU4DQN Fixing a bug in unrecord, where a patch creating an undeletion conflict would not be properly unrecorded

Change contents

• edit in libpijul/src/unrecord/mod.rs at line 716
  [4.3885]→[3.3184:3184](∅→∅)
  −
• edit in libpijul/src/lib.rs at line 78
  [4.83621]→[4.83621:83668](∅→∅),[4.83668]→[2.12:51](∅→∅),[2.51]→[4.4030:4100](∅→∅),[4.83668]→[4.4030:4100](∅→∅),[4.4100]→[2.52:96](∅→∅)
  − // Making hashmaps deterministic (for testing)

  − #[cfg(feature = "deterministic_hash")]

  − pub type Hasher = std::hash::BuildHasherDefault<twox_hash::XxHash64>;

  − #[cfg(not(feature = "deterministic_hash"))]