{"header":{"message":"Fixing the tests related to conflict numbers","description":"These hadn't been updated when we started the numbers at 1 instead of 0","timestamp":"2025-12-28T20:28:14.996401009Z","authors":[{}]},"hash":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC","authors":[{"login":"pmeunier","key":"8ES6e1QmLjuQn1DzS2DQRKebzCKPHpdf4E9hfwMqQoe7"}],"deps":{"hashes":[["VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC","Fixing the tests related to conflict numbers"],["AA",null],["55SCQOOHI4VRYNKPKDV5PVDXZIY4DG6URA2TMBLQGYLNI6YC7XHAC","Fixing the tests"],["UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC","Fixing the tests"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"]],"deps":["55SCQOOHI4VRYNKPKDV5PVDXZIY4DG6URA2TMBLQGYLNI6YC7XHAC","UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":123,"ins":{"up_context":[{"change":3,"pos":684}],"down_context":[{"change":4,"pos":294642}],"flag":"BLOCK","start":0,"end":61,"inode":{"change":4,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":684},"to":{"change":3,"start":684,"end":745},"introduced_by":3}],"inode":{"change":4,"pos":291589}},"ins_contents":[{"Add":{"text":" Ok(&\"a\\n>>>>>>> 1\\nx\\ny\\nz\\n<<<<<<< 1\\nf\\n\"[..])","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:60"}}],"del_contents":[{"Del":{"text":" Ok(&\"a\\n>>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\nf\\n\"[..])","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:744"}}]}},{"Replacement":{"inode":{"change":4,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":128,"ins":{"up_context":[{"change":3,"pos":786}],"down_context":[{"change":4,"pos":294822}],"flag":"BLOCK","start":62,"end":117,"inode":{"change":4,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":786},"to":{"change":3,"start":786,"end":841},"introduced_by":3}],"inode":{"change":4,"pos":291589}},"ins_contents":[{"Add":{"text":" Ok(&\">>>>>>> 1\\nx\\ny\\nz\\n<<<<<<< 1\\n\"[..])","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:116"}}],"del_contents":[{"Del":{"text":" Ok(&\">>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\n\"[..])","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:840"}}]}},{"Replacement":{"inode":{"change":4,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":179,"ins":{"up_context":[{"change":3,"pos":933}],"down_context":[{"change":4,"pos":296269}],"flag":"BLOCK","start":118,"end":201,"inode":{"change":4,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":933},"to":{"change":3,"start":933,"end":1016},"introduced_by":3}],"inode":{"change":4,"pos":291589}},"ins_contents":[{"Add":{"text":" Ok(&\"a\\n>>>>>>> 1\\nx\\n<<<<<<< 1\\ny\\n>>>>>>> 2\\nz\\n<<<<<<< 2\\nf\\n\"[..])","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:200"}}],"del_contents":[{"Del":{"text":" Ok(&\"a\\n>>>>>>> 0\\nx\\n<<<<<<< 0\\ny\\n>>>>>>> 1\\nz\\n<<<<<<< 1\\nf\\n\"[..])","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:1015"}}]}},{"Replacement":{"inode":{"change":4,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":184,"ins":{"up_context":[{"change":3,"pos":1057}],"down_context":[{"change":4,"pos":296449}],"flag":"BLOCK","start":202,"end":257,"inode":{"change":4,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1057},"to":{"change":3,"start":1057,"end":1112},"introduced_by":3}],"inode":{"change":4,"pos":291589}},"ins_contents":[{"Add":{"text":" Ok(&\">>>>>>> 1\\nx\\ny\\nz\\n<<<<<<< 1\\n\"[..])","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:256"}}],"del_contents":[{"Del":{"text":" Ok(&\">>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\n\"[..])","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:1111"}}]}},{"Replacement":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":776,"ins":{"up_context":[{"change":4,"pos":379289}],"down_context":[{"change":2,"pos":7051}],"flag":"BLOCK","start":258,"end":296,"inode":{"change":4,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":379289},"to":{"change":4,"start":379289,"end":379318},"introduced_by":4}],"inode":{"change":4,"pos":357372}},"ins_contents":[{"Add":{"text":" // Bob inserts xy between a and b","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:295"}}],"del_contents":[{"Del":{"text":" // Bob edits and records","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:379317"}}]}},{"Replacement":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":783,"ins":{"up_context":[{"change":4,"pos":379676}],"down_context":[{"change":2,"pos":7154}],"flag":"BLOCK","start":297,"end":351,"inode":{"change":4,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":379676},"to":{"change":4,"start":379676,"end":379707},"introduced_by":4}],"inode":{"change":4,"pos":357372}},"ins_contents":[{"Add":{"text":" // Alice inserts xy between a and b (same as Bob)","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:350"}}],"del_contents":[{"Del":{"text":" // Alice edits and records","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:379706"}}]}},{"Edit":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":789,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":58334}],"down_context":[{"change":4,"pos":379952}],"flag":"BLOCK","start":352,"end":497,"inode":{"change":4,"pos":357372}}},"contents":[{"Add":{"text":"","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:352"}},{"Add":{"text":" crate::pristine::debug(","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:380"}},{"Add":{"text":" &*txn.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:402"}},{"Add":{"text":" &*channel_alice.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:434"}},{"Add":{"text":" std::fs::File::create(\"alice0.dot\").unwrap(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:488"}},{"Add":{"text":" )?;","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:496"}}]}},{"Edit":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":798,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":58405}],"down_context":[{"change":4,"pos":380060}],"flag":"BLOCK","start":498,"end":642,"inode":{"change":4,"pos":357372}}},"contents":[{"Add":{"text":" crate::pristine::debug(","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:525"}},{"Add":{"text":" &*txn.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:547"}},{"Add":{"text":" &*channel_alice.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:579"}},{"Add":{"text":" std::fs::File::create(\"alice1.dot\").unwrap(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:633"}},{"Add":{"text":" )?;","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:641"}}]}},{"Edit":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":820,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":58490}],"down_context":[{"change":2,"pos":7259}],"flag":"BLOCK","start":643,"end":756,"inode":{"change":4,"pos":357372}}},"contents":[{"Add":{"text":" // Delete b and x, insert pre/post before/after conflict","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:707"}},{"Add":{"text":" // markers (except the closing marker).","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:755"}}]}},{"Edit":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":834,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":380818}],"down_context":[{"change":4,"pos":380882}],"flag":"BLOCK","start":757,"end":811,"inode":{"change":4,"pos":357372}}},"contents":[{"Add":{"text":" debug!(\"{}\", std::str::from_utf8(&buf).unwrap());","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:810"}}]}},{"Edit":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":838,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":58629}],"down_context":[{"change":4,"pos":380996}],"flag":"BLOCK","start":812,"end":1097,"inode":{"change":4,"pos":357372}}},"contents":[{"Add":{"text":"","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:812"}},{"Add":{"text":" crate::pristine::debug(","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:840"}},{"Add":{"text":" &*txn.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:862"}},{"Add":{"text":" &*channel_alice.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:894"}},{"Add":{"text":" std::fs::File::create(\"alice2.dot\").unwrap(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:948"}},{"Add":{"text":" )?;","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:956"}},{"Add":{"text":" crate::pristine::debug(","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:984"}},{"Add":{"text":" &*txn.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1006"}},{"Add":{"text":" &*channel_bob.read(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1036"}},{"Add":{"text":" std::fs::File::create(\"bob.dot\").unwrap(),","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1087"}},{"Add":{"text":" )?;","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1095"}},{"Add":{"text":"","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1096"}}]}},{"Replacement":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1248,"ins":{"up_context":[{"change":3,"pos":3354}],"down_context":[{"change":4,"pos":393558}],"flag":"BLOCK","start":1098,"end":1165,"inode":{"change":4,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3354},"to":{"change":3,"start":3354,"end":3421},"introduced_by":3}],"inode":{"change":4,"pos":357372}},"ins_contents":[{"Add":{"text":" assert_eq!(conflict, vec![\">>>>>>> 1\", \"x\", \"<<<<<<< 1\"]);","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1164"}}],"del_contents":[{"Del":{"text":" assert_eq!(conflict, vec![\">>>>>>> 0\", \"x\", \"<<<<<<< 0\"]);","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:3420"}}]}},{"Replacement":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1790,"ins":{"up_context":[{"change":3,"pos":5057}],"down_context":[{"change":4,"pos":409910}],"flag":"BLOCK","start":1166,"end":1243,"inode":{"change":4,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5057},"to":{"change":3,"start":5057,"end":5134},"introduced_by":3}],"inode":{"change":4,"pos":357372}},"ins_contents":[{"Add":{"text":" assert_eq!(std::str::from_utf8(&buf_), Ok(\">>>>>>> 1\\nx\\n<<<<<<< 1\\n\"));","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1242"}}],"del_contents":[{"Del":{"text":" assert_eq!(std::str::from_utf8(&buf_), Ok(\">>>>>>> 0\\nx\\n<<<<<<< 0\\n\"));","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:5133"}}]}},{"Replacement":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1830,"ins":{"up_context":[{"change":3,"pos":5184}],"down_context":[{"change":4,"pos":67977}],"flag":"BLOCK","start":1244,"end":1322,"inode":{"change":4,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5184},"to":{"change":3,"start":5184,"end":5262},"introduced_by":3}],"inode":{"change":4,"pos":357372}},"ins_contents":[{"Add":{"text":" assert_eq!(std::str::from_utf8(&buf2_), Ok(\">>>>>>> 1\\nx\\n<<<<<<< 1\\n\"));","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1321"}}],"del_contents":[{"Del":{"text":" assert_eq!(std::str::from_utf8(&buf2_), Ok(\">>>>>>> 0\\nx\\n<<<<<<< 0\\n\"));","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:5261"}}]}},{"Replacement":{"inode":{"change":4,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1924,"ins":{"up_context":[{"change":3,"pos":5412}],"down_context":[{"change":4,"pos":414149}],"flag":"BLOCK","start":1323,"end":1369,"inode":{"change":4,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5412},"to":{"change":3,"start":5412,"end":5458},"introduced_by":3}],"inode":{"change":4,"pos":357372}},"ins_contents":[{"Add":{"text":" Ok(\">>>>>>> 1\\nx\\ny\\nz\\n<<<<<<< 1\\n\")","pos":"VGTHZH5MWGH37ZSZWHDGYBOAXJAKELHAE6LLOZNMESPAN2PNXR6QC:1368"}}],"del_contents":[{"Del":{"text":" Ok(\">>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\n\")","pos":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC:5457"}}]}}],"owner":"Chasesomero","repo":"pijul","token":"9Go3wHz8mrEstmYV+sjEteEyuNkOJ14hv5LrzLlVrcU=","login":null}

…

Dependencies

Change contents

Review