{"header":{"message":"Fixing the tests","description":null,"timestamp":"2022-01-04T12:31:52.022084471Z","authors":[{}]},"hash":"UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC","Fixing the tests"],["AA",null],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQC","Started fixing the tests for parallel record/output"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC","Fixing more tests"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["55SCQOOHI4VRYNKPKDV5PVDXZIY4DG6URA2TMBLQGYLNI6YC7XHAC","Fixing the tests"],["BC3QS46ORO56YB2LO3PRU74ITVOYFFKL3GGIBPV4M2DPH6NYJMEAC","Fix test compilation"],["OEKRRU6OMDAHD3UT2L56WTAVYMJUZM7JBTRJBJR6MAV7EXBPTHYQC","Fix test compilation"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"]],"deps":["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQC","SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC","OEKRRU6OMDAHD3UT2L56WTAVYMJUZM7JBTRJBJR6MAV7EXBPTHYQC","55SCQOOHI4VRYNKPKDV5PVDXZIY4DG6URA2TMBLQGYLNI6YC7XHAC","BC3QS46ORO56YB2LO3PRU74ITVOYFFKL3GGIBPV4M2DPH6NYJMEAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":546,"ins":{"up_context":[{"change":3,"pos":267896}],"down_context":[{"change":3,"pos":267973}],"flag":"BLOCK","start":0,"end":192,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":267896},"to":{"change":3,"start":267896,"end":267973},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":""},{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":""},{"Add":" let mut conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();"}],"del_contents":[{"Del":" let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":554,"ins":{"up_context":[{"change":3,"pos":268028}],"down_context":[{"change":3,"pos":268263}],"flag":"BLOCK","start":193,"end":265,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":268028},"to":{"change":3,"start":268028,"end":268263},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" vec![\"<<<<<<< 1\", \"======= 1\", \">>>>>>> 1\", \"a\", \"b\", \"x\", \"y\"]"}],"del_contents":[{"Del":" vec![\n \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n \"================================\",\n \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n \"a\",\n \"b\",\n \"x\",\n \"y\"\n ]\n"}]}},{"Edit":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":822,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":27769}],"down_context":[{"change":19,"pos":1794}],"flag":"BLOCK","start":266,"end":342,"inode":{"change":3,"pos":248807}}},"contents":[{"Add":" let (x, _) = inodes.next().unwrap().unwrap();"},{"Add":" assert!(x.is_root());"}]}},{"Replacement":{"inode":{"change":3,"pos":10},"path":"libpijul/src/tests/text.rs","line":32,"ins":{"up_context":[{"change":3,"pos":1117}],"down_context":[{"change":3,"pos":1206}],"flag":"BLOCK","start":343,"end":500,"inode":{"change":3,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1117},"to":{"change":3,"start":1117,"end":1206},"introduced_by":3}],"inode":{"change":3,"pos":10}},"ins_contents":[{"Add":" vec!["},{"Add":" \"+ French / Français (Windows CP 1252)\","},{"Add":" \"+ € abcde ‚ xys ƒ uvw „ !bla …... † XA>TH ‡, Salut\""},{"Add":" ],"}],"del_contents":[{"Del":" vec![\"+ French / Français (Windows CP 1252)\", \"+ €‚ƒ„…†‡, Salut\"],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":53,"ins":{"up_context":[{"change":3,"pos":6193}],"down_context":[{"change":3,"pos":279951}],"flag":"BLOCK","start":501,"end":530,"inode":{"change":3,"pos":278146}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":6193},"to":{"change":3,"start":279923,"end":279951},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":27843},"to":{"change":3,"start":279923,"end":279951},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":279923},"to":{"change":3,"start":279923,"end":279951},"introduced_by":3}],"inode":{"change":3,"pos":278146}},"ins_contents":[{"Add":" let m0 = n * 8 + 10;"}],"del_contents":[{"Del":" let m0 = n * 8 + 6;\n"}]}},{"Edit":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":110,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":294404}],"down_context":[{"change":3,"pos":294404}],"flag":"BLOCK","start":531,"end":643,"inode":{"change":3,"pos":291589}}},"contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":114,"ins":{"up_context":[{"change":3,"pos":294449}],"down_context":[{"change":3,"pos":294642}],"flag":"BLOCK","start":644,"end":745,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":294449},"to":{"change":3,"start":294449,"end":294504},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":294504},"to":{"change":2,"start":22757,"end":22860},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":4360},"to":{"change":3,"start":294603,"end":294642},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":14575},"to":{"change":3,"start":294603,"end":294642},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":22860},"to":{"change":3,"start":294603,"end":294642},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":294603},"to":{"change":3,"start":294603,"end":294642},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" std::str::from_utf8(&buf_),"},{"Add":" Ok(&\"a\\n>>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\nf\\n\"[..])"}],"del_contents":[{"Del":" std::str::from_utf8(&buf),\n Ok(\n"},{"Del":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\ny\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\"\n"},{"Del":" [..]\n )\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":119,"ins":{"up_context":[{"change":3,"pos":294686}],"down_context":[{"change":3,"pos":294822}],"flag":"BLOCK","start":746,"end":841,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":294686},"to":{"change":3,"start":294686,"end":294725},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":294725},"to":{"change":2,"start":22861,"end":22992},"introduced_by":2}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" std::str::from_utf8(&buf_),"},{"Add":" Ok(&\">>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\n\"[..])"}],"del_contents":[{"Del":" std::str::from_utf8(&buf),\n"},{"Del":" Ok(\n &\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\ny\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..]\n )\n"}]}},{"Edit":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":167,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":296056}],"down_context":[{"change":3,"pos":296056}],"flag":"BLOCK","start":842,"end":892,"inode":{"change":3,"pos":291589}}},"contents":[{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":169,"ins":{"up_context":[{"change":3,"pos":296076}],"down_context":[{"change":3,"pos":296269}],"flag":"BLOCK","start":893,"end":1016,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":296076},"to":{"change":3,"start":296076,"end":296131},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":296131},"to":{"change":3,"start":15220,"end":15391},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":15391},"to":{"change":3,"start":296230,"end":296269},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":296230},"to":{"change":3,"start":296230,"end":296269},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" std::str::from_utf8(&buf_),"},{"Add":" Ok(&\"a\\n>>>>>>> 0\\nx\\n<<<<<<< 0\\ny\\n>>>>>>> 1\\nz\\n<<<<<<< 1\\nf\\n\"[..])"}],"del_contents":[{"Del":" std::str::from_utf8(&buf),\n Ok(\n"},{"Del":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\ny\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\"\n"},{"Del":" [..]\n )\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":174,"ins":{"up_context":[{"change":3,"pos":296313}],"down_context":[{"change":3,"pos":296449}],"flag":"BLOCK","start":1017,"end":1112,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":296313},"to":{"change":3,"start":296313,"end":296352},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":296352},"to":{"change":3,"start":15392,"end":15561},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" std::str::from_utf8(&buf_),"},{"Add":" Ok(&\">>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\n\"[..])"}],"del_contents":[{"Del":" std::str::from_utf8(&buf),\n"},{"Del":" Ok(&\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\ny\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..])\n"}]}},{"Edit":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":385,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":33076}],"down_context":[{"change":3,"pos":318182}],"flag":"BLOCK","start":1113,"end":1315,"inode":{"change":3,"pos":305506}}},"contents":[{"Add":""},{"Add":" {"},{"Add":" let txn_ = txn_charlie.write();"},{"Add":" let mut f = std::fs::File::create(\"/tmp/charlie0\")?;"},{"Add":" crate::pristine::debug(&*txn_, &txn_.graph(&*channel_charlie.read()), &mut f)?;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":416,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":33376}],"down_context":[{"change":3,"pos":5425}],"flag":"BLOCK","start":1316,"end":1519,"inode":{"change":3,"pos":305506}}},"contents":[{"Add":""},{"Add":" {"},{"Add":" let txn_ = txn_charlie.write();"},{"Add":" let mut f = std::fs::File::create(\"/tmp/charlie1\")?;"},{"Add":" crate::pristine::debug(&*txn_, &txn_.graph(&*channel_charlie.read()), &mut f)?;"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":3289},"path":"libpijul/src/tests/data/1252.1","line":2,"ins":{"up_context":[{"change":3,"pos":3326}],"down_context":[],"flag":"BLOCK","start":1520,"end":1569,"inode":{"change":3,"pos":3289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3326},"to":{"change":3,"start":3326,"end":3341},"introduced_by":3}],"inode":{"change":3,"pos":3289}},"ins_contents":[],"del_contents":[]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":89,"ins":{"up_context":[{"change":3,"pos":359846}],"down_context":[{"change":3,"pos":359922}],"flag":"BLOCK","start":1570,"end":1768,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":359846},"to":{"change":3,"start":359846,"end":359922},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();"}],"del_contents":[{"Del":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":100,"ins":{"up_context":[{"change":3,"pos":360154}],"down_context":[{"change":3,"pos":360266}],"flag":"BLOCK","start":1769,"end":1835,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":360154},"to":{"change":3,"start":360154,"end":360266},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","},{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":108,"ins":{"up_context":[{"change":3,"pos":360416}],"down_context":[{"change":3,"pos":360472}],"flag":"BLOCK","start":1836,"end":1869,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":360416},"to":{"change":3,"start":360416,"end":360472},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":309,"ins":{"up_context":[{"change":3,"pos":365897}],"down_context":[{"change":3,"pos":365973}],"flag":"BLOCK","start":1870,"end":2069,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":365897},"to":{"change":3,"start":365897,"end":365973},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":""},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();"}],"del_contents":[{"Del":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":321,"ins":{"up_context":[{"change":3,"pos":366205}],"down_context":[{"change":3,"pos":366373}],"flag":"BLOCK","start":2070,"end":2169,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":366205},"to":{"change":3,"start":366205,"end":366373},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","},{"Add":" \"======= 1\","},{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n \"================================\",\n \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":327,"ins":{"up_context":[{"change":3,"pos":366448}],"down_context":[{"change":3,"pos":366504}],"flag":"BLOCK","start":2170,"end":2203,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":366448},"to":{"change":3,"start":366448,"end":366504},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":400,"ins":{"up_context":[{"change":3,"pos":368066}],"down_context":[{"change":3,"pos":2816}],"flag":"BLOCK","start":2204,"end":2406,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":368066},"to":{"change":3,"start":368066,"end":368147},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let mut conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();"}],"del_contents":[{"Del":" let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":408,"ins":{"up_context":[{"change":3,"pos":368266}],"down_context":[{"change":3,"pos":368370}],"flag":"BLOCK","start":2407,"end":2465,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":368266},"to":{"change":3,"start":368266,"end":368370},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","},{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":413,"ins":{"up_context":[{"change":3,"pos":368433}],"down_context":[{"change":3,"pos":368485}],"flag":"BLOCK","start":2466,"end":2495,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":368433},"to":{"change":3,"start":368433,"end":368485},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":704,"ins":{"up_context":[{"change":3,"pos":377440}],"down_context":[{"change":3,"pos":377575}],"flag":"BLOCK","start":2496,"end":2655,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":17923},"to":{"change":3,"start":377504,"end":377575},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":24608},"to":{"change":3,"start":377504,"end":377575},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":377504},"to":{"change":3,"start":377504,"end":377575},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\"\\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let buf2_ = re.replace_all(&buf2, &[][..]);"}],"del_contents":[{"Del":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));\n"}]}},{"Edit":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":708,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":377576}],"down_context":[{"change":3,"pos":377576}],"flag":"BLOCK","start":2656,"end":2730,"inode":{"change":3,"pos":357372}}},"contents":[{"Add":" assert_eq!(std::str::from_utf8(&buf_), std::str::from_utf8(&buf2_));"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":830,"ins":{"up_context":[{"change":3,"pos":381282}],"down_context":[{"change":3,"pos":381417}],"flag":"BLOCK","start":2731,"end":2963,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":18442},"to":{"change":3,"start":381346,"end":381417},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":25064},"to":{"change":3,"start":381346,"end":381417},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":381346},"to":{"change":3,"start":381346,"end":381417},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\"\\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let buf2_ = re.replace_all(&buf2, &[][..]);"},{"Add":" assert_eq!(std::str::from_utf8(&buf_), std::str::from_utf8(&buf2_));"}],"del_contents":[{"Del":" assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1002,"ins":{"up_context":[{"change":3,"pos":92}],"down_context":[{"change":3,"pos":386432}],"flag":"BLOCK","start":2964,"end":3007,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":92},"to":{"change":3,"start":386401,"end":386432},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":386401},"to":{"change":3,"start":386401,"end":386432},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" assert_eq!(&lines[3..], &lines2[3..]);"}],"del_contents":[{"Del":" assert_eq!(lines, lines2);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1083,"ins":{"up_context":[{"change":3,"pos":388991}],"down_context":[{"change":3,"pos":389380}],"flag":"BLOCK","start":3008,"end":3155,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":388991},"to":{"change":3,"start":2980,"end":3031},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3031},"to":{"change":3,"start":389033,"end":389380},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":389033},"to":{"change":3,"start":389033,"end":389380},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" conflict.sort_unstable();"},{"Add":" assert_eq!(&conflict[3..], [\"a\", \"x\", \"y\",]);"},{"Add":" assert_eq!(conflict[0], \"<<<<<<< 1\",);"}],"del_contents":[{"Del":" (&mut conflict[2..5]).sort_unstable();\n"},{"Del":" assert_eq!(\n conflict,\n vec![\n \"a\",\n \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n \"================================\",\n \"x\",\n \"y\",\n \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\"\n ]\n );\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1211,"ins":{"up_context":[{"change":3,"pos":393273}],"down_context":[{"change":3,"pos":393558}],"flag":"BLOCK","start":3156,"end":3421,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":393273},"to":{"change":3,"start":393273,"end":393558},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();"},{"Add":" assert_eq!(conflict, vec![\">>>>>>> 0\", \"x\", \"<<<<<<< 0\"]);"}],"del_contents":[{"Del":" let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();\n assert_eq!(\n conflict,\n vec![\n \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n \"x\",\n \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\"\n ]\n );\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1287,"ins":{"up_context":[{"change":3,"pos":395401}],"down_context":[{"change":3,"pos":395485}],"flag":"BLOCK","start":3422,"end":3635,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":395401},"to":{"change":3,"start":395401,"end":395485},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let buf: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();"}],"del_contents":[{"Del":" let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1293,"ins":{"up_context":[{"change":3,"pos":395557}],"down_context":[{"change":3,"pos":395613}],"flag":"BLOCK","start":3636,"end":3669,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":395557},"to":{"change":3,"start":395557,"end":395613},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1297,"ins":{"up_context":[{"change":3,"pos":395688}],"down_context":[{"change":3,"pos":395744}],"flag":"BLOCK","start":3670,"end":3703,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":395688},"to":{"change":3,"start":395688,"end":395744},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1301,"ins":{"up_context":[{"change":3,"pos":395819}],"down_context":[{"change":3,"pos":395875}],"flag":"BLOCK","start":3704,"end":3737,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":395819},"to":{"change":3,"start":395819,"end":395875},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1306,"ins":{"up_context":[{"change":3,"pos":395980}],"down_context":[{"change":3,"pos":396040}],"flag":"BLOCK","start":3738,"end":3775,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":395980},"to":{"change":3,"start":395980,"end":396040},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1310,"ins":{"up_context":[{"change":3,"pos":396127}],"down_context":[{"change":3,"pos":396187}],"flag":"BLOCK","start":3776,"end":3813,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":396127},"to":{"change":3,"start":396127,"end":396187},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1314,"ins":{"up_context":[{"change":3,"pos":396274}],"down_context":[{"change":3,"pos":396334}],"flag":"BLOCK","start":3814,"end":3851,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":396274},"to":{"change":3,"start":396274,"end":396334},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1337,"ins":{"up_context":[{"change":3,"pos":396908}],"down_context":[{"change":3,"pos":396992}],"flag":"BLOCK","start":3852,"end":4065,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":396908},"to":{"change":3,"start":396908,"end":396992},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let buf: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();"}],"del_contents":[{"Del":" let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1343,"ins":{"up_context":[{"change":3,"pos":397064}],"down_context":[{"change":3,"pos":397120}],"flag":"BLOCK","start":4066,"end":4099,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397064},"to":{"change":3,"start":397064,"end":397120},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1347,"ins":{"up_context":[{"change":3,"pos":397195}],"down_context":[{"change":3,"pos":397251}],"flag":"BLOCK","start":4100,"end":4133,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397195},"to":{"change":3,"start":397195,"end":397251},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1351,"ins":{"up_context":[{"change":3,"pos":397326}],"down_context":[{"change":3,"pos":397382}],"flag":"BLOCK","start":4134,"end":4167,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397326},"to":{"change":3,"start":397326,"end":397382},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1356,"ins":{"up_context":[{"change":3,"pos":397487}],"down_context":[{"change":3,"pos":397547}],"flag":"BLOCK","start":4168,"end":4205,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397487},"to":{"change":3,"start":397487,"end":397547},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \">>>>>>> 1\","}],"del_contents":[{"Del":" \">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1360,"ins":{"up_context":[{"change":3,"pos":397634}],"down_context":[{"change":3,"pos":397694}],"flag":"BLOCK","start":4206,"end":4243,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397634},"to":{"change":3,"start":397634,"end":397694},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"======= 1\","}],"del_contents":[{"Del":" \"================================\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1364,"ins":{"up_context":[{"change":3,"pos":397781}],"down_context":[{"change":3,"pos":397841}],"flag":"BLOCK","start":4244,"end":4281,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397781},"to":{"change":3,"start":397781,"end":397841},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" \"<<<<<<< 1\","}],"del_contents":[{"Del":" \"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1506,"ins":{"up_context":[{"change":3,"pos":402116}],"down_context":[{"change":3,"pos":3136}],"flag":"BLOCK","start":4282,"end":4526,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":402116},"to":{"change":3,"start":402116,"end":402198},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":""},{"Add":" let re = regex::bytes::Regex::new(r#\"\\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let buf2_ = re.replace_all(&buf2, &[][..]);"},{"Add":""},{"Add":" let mut lines: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();"}],"del_contents":[{"Del":" let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1513,"ins":{"up_context":[{"change":3,"pos":3163}],"down_context":[{"change":3,"pos":3164}],"flag":"BLOCK","start":4527,"end":4612,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":3163},"to":{"change":3,"start":402216,"end":402300},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":402216},"to":{"change":3,"start":402216,"end":402300},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2_).unwrap().lines().collect();"}],"del_contents":[{"Del":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1664,"ins":{"up_context":[{"change":3,"pos":406827}],"down_context":[{"change":3,"pos":3193}],"flag":"BLOCK","start":4613,"end":4857,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":406827},"to":{"change":3,"start":406827,"end":406909},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":" let buf2_ = re.replace_all(&buf2, &[][..]);"},{"Add":""},{"Add":" let mut lines: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();"}],"del_contents":[{"Del":" let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1670,"ins":{"up_context":[{"change":3,"pos":3220}],"down_context":[{"change":3,"pos":3221}],"flag":"BLOCK","start":4858,"end":4943,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":3220},"to":{"change":3,"start":406927,"end":407011},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":406927},"to":{"change":3,"start":406927,"end":407011},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2_).unwrap().lines().collect();"}],"del_contents":[{"Del":" let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1753,"ins":{"up_context":[{"change":3,"pos":409766}],"down_context":[{"change":3,"pos":409910}],"flag":"BLOCK","start":4944,"end":5134,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":409766},"to":{"change":3,"start":409766,"end":409910},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"},{"Add":""},{"Add":" assert_eq!(std::str::from_utf8(&buf_), Ok(\">>>>>>> 0\\nx\\n<<<<<<< 0\\n\"));"}],"del_contents":[{"Del":" assert_eq!(\n std::str::from_utf8(&buf),\n Ok(\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\")\n );\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1794,"ins":{"up_context":[{"change":3,"pos":410878}],"down_context":[{"change":2,"pos":67977}],"flag":"BLOCK","start":5135,"end":5262,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":410878},"to":{"change":3,"start":410878,"end":411023},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let buf2_ = re.replace_all(&buf2, &[][..]);"},{"Add":""},{"Add":" assert_eq!(std::str::from_utf8(&buf2_), Ok(\">>>>>>> 0\\nx\\n<<<<<<< 0\\n\"));"}],"del_contents":[{"Del":" assert_eq!(\n std::str::from_utf8(&buf2),\n Ok(\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\")\n );\n"}]}},{"Edit":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1886,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":414006}],"down_context":[{"change":3,"pos":414006}],"flag":"BLOCK","start":5263,"end":5375,"inode":{"change":3,"pos":357372}}},"contents":[{"Add":" let re = regex::bytes::Regex::new(r#\" \\[[^\\]]*\\]\"#).unwrap();"},{"Add":" let buf_ = re.replace_all(&buf, &[][..]);"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1889,"ins":{"up_context":[{"change":3,"pos":414022}],"down_context":[{"change":3,"pos":414149}],"flag":"BLOCK","start":5376,"end":5458,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":414022},"to":{"change":3,"start":414022,"end":414149},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" std::str::from_utf8(&buf_),"},{"Add":" Ok(\">>>>>>> 0\\nx\\ny\\nz\\n<<<<<<< 0\\n\")"}],"del_contents":[{"Del":" std::str::from_utf8(&buf),\n Ok(\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\ny\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\")\n"}]}}],"owner":"irevoire","repo":"pijul","token":"Jw39mdlGNupYhLfYlLxh3XZzkorWUQWQj5JueSIjmgg=","login":null}

…

Dependencies

Change contents