{"header":{"message":"Re-adding anyhow in the tests of libpijul","description":null,"timestamp":"2020-12-08T13:29:02.511432382Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","authors":[],"deps":{"hashes":[["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["AA",null],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"]],"deps":["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":22,"ins":{"up_context":[{"change":3,"pos":249472}],"down_context":[{"change":3,"pos":249510}],"flag":"","start":0,"end":62,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":249472},"to":{"change":3,"start":249472,"end":249510},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":69,"ins":{"up_context":[{"change":3,"pos":250818}],"down_context":[{"change":3,"pos":250856}],"flag":"","start":63,"end":125,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":250818},"to":{"change":3,"start":250818,"end":250856},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":196,"ins":{"up_context":[{"change":3,"pos":254929}],"down_context":[{"change":3,"pos":254967}],"flag":"","start":126,"end":188,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":254929},"to":{"change":3,"start":254929,"end":254967},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":204,"ins":{"up_context":[{"change":3,"pos":255132}],"down_context":[{"change":3,"pos":255167}],"flag":"","start":189,"end":248,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":255132},"to":{"change":3,"start":255132,"end":255167},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo2.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo2.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":210,"ins":{"up_context":[{"change":3,"pos":255312}],"down_context":[{"change":3,"pos":255347}],"flag":"","start":249,"end":308,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":255312},"to":{"change":3,"start":255312,"end":255347},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo2.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo2.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":263,"ins":{"up_context":[{"change":3,"pos":257055}],"down_context":[{"change":3,"pos":257093}],"flag":"","start":309,"end":371,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":257055},"to":{"change":3,"start":257055,"end":257093},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":275,"ins":{"up_context":[{"change":3,"pos":257356}],"down_context":[{"change":3,"pos":257391}],"flag":"","start":372,"end":431,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":257356},"to":{"change":3,"start":257356,"end":257391},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo2.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo2.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":429,"ins":{"up_context":[{"change":3,"pos":261933}],"down_context":[{"change":3,"pos":261971}],"flag":"","start":432,"end":494,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":261933},"to":{"change":3,"start":261933,"end":261971},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":438,"ins":{"up_context":[{"change":3,"pos":262212}],"down_context":[{"change":3,"pos":262406}],"flag":"","start":495,"end":574,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":262212},"to":{"change":3,"start":262212,"end":262406},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" Err(crate::unrecord::UnrecordError::ChangeIsDependedUpon { .. }) => {}"}],"del_contents":[{"Del":" Err(e) => {\n let e = e.downcast();\n if let Ok(Error::ChangeIsDependedUpon { .. }) = e {\n } else {\n unreachable!()\n }\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":445,"ins":{"up_context":[{"change":3,"pos":262631}],"down_context":[{"change":3,"pos":262823}],"flag":"","start":575,"end":652,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":262631},"to":{"change":3,"start":262631,"end":262823},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" Err(crate::unrecord::UnrecordError::ChangeNotInChannel { .. }) => {}"}],"del_contents":[{"Del":" Err(e) => {\n let e = e.downcast();\n if let Ok(Error::ChangeNotOnChannel { .. }) = e {\n } else {\n unreachable!()\n }\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":562,"ins":{"up_context":[{"change":3,"pos":266093}],"down_context":[{"change":3,"pos":266159}],"flag":"","start":653,"end":743,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":266093},"to":{"change":3,"start":266093,"end":266159},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| Ok(w.write_all(b\"a\\nx\\nb\\n\")?))?;"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| Ok(w.write_all(b\"a\\nx\\nb\\n\")?))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":564,"ins":{"up_context":[{"change":3,"pos":266225}],"down_context":[{"change":3,"pos":266291}],"flag":"","start":744,"end":834,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":266225},"to":{"change":3,"start":266225,"end":266291},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| Ok(w.write_all(b\"a\\ny\\nb\\n\")?))?;"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| Ok(w.write_all(b\"a\\ny\\nb\\n\")?))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":587,"ins":{"up_context":[{"change":3,"pos":266973}],"down_context":[{"change":3,"pos":267007}],"flag":"","start":835,"end":893,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":266973},"to":{"change":3,"start":266973,"end":267007},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":670,"ins":{"up_context":[{"change":3,"pos":269093}],"down_context":[{"change":3,"pos":269131}],"flag":"","start":894,"end":956,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":269093},"to":{"change":3,"start":269093,"end":269131},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":757,"ins":{"up_context":[{"change":3,"pos":271698}],"down_context":[{"change":2,"pos":140}],"flag":"","start":957,"end":1015,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":271698},"to":{"change":3,"start":271698,"end":271732},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":767,"ins":{"up_context":[{"change":3,"pos":271969}],"down_context":[{"change":2,"pos":181}],"flag":"","start":1016,"end":1074,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":271969},"to":{"change":3,"start":271969,"end":272003},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":823,"ins":{"up_context":[{"change":3,"pos":273666}],"down_context":[{"change":3,"pos":273700}],"flag":"","start":1075,"end":1133,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":273666},"to":{"change":3,"start":273666,"end":273700},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":833,"ins":{"up_context":[{"change":3,"pos":273937}],"down_context":[{"change":2,"pos":214}],"flag":"","start":1134,"end":1192,"inode":{"change":3,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":273937},"to":{"change":3,"start":273937,"end":273971},"introduced_by":3}],"inode":{"change":3,"pos":248807}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":25,"ins":{"up_context":[{"change":3,"pos":278957}],"down_context":[{"change":3,"pos":278995}],"flag":"","start":1193,"end":1255,"inode":{"change":3,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":278957},"to":{"change":3,"start":278957,"end":278995},"introduced_by":3}],"inode":{"change":3,"pos":278146}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":39,"ins":{"up_context":[{"change":3,"pos":279409}],"down_context":[{"change":3,"pos":279443}],"flag":"","start":1256,"end":1314,"inode":{"change":3,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":279409},"to":{"change":3,"start":279409,"end":279443},"introduced_by":3}],"inode":{"change":3,"pos":278146}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":86,"ins":{"up_context":[{"change":3,"pos":280798}],"down_context":[{"change":3,"pos":280836}],"flag":"","start":1315,"end":1377,"inode":{"change":3,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":280798},"to":{"change":3,"start":280798,"end":280836},"introduced_by":3}],"inode":{"change":3,"pos":278146}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":101,"ins":{"up_context":[{"change":3,"pos":281302}],"down_context":[{"change":3,"pos":281336}],"flag":"","start":1378,"end":1436,"inode":{"change":3,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":281302},"to":{"change":3,"start":281302,"end":281336},"introduced_by":3}],"inode":{"change":3,"pos":278146}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":115,"ins":{"up_context":[{"change":3,"pos":281709}],"down_context":[{"change":3,"pos":281743}],"flag":"","start":1437,"end":1495,"inode":{"change":3,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":281709},"to":{"change":3,"start":281709,"end":281743},"introduced_by":3}],"inode":{"change":3,"pos":278146}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":68,"ins":{"up_context":[{"change":3,"pos":287620}],"down_context":[{"change":3,"pos":287661}],"flag":"","start":1496,"end":1561,"inode":{"change":3,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":287620},"to":{"change":3,"start":287620,"end":287661},"introduced_by":3}],"inode":{"change":3,"pos":285224}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"a/b/c/d\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"a/b/c/d\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":72,"ins":{"up_context":[{"change":3,"pos":287731}],"down_context":[{"change":3,"pos":287772}],"flag":"","start":1562,"end":1627,"inode":{"change":3,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":287731},"to":{"change":3,"start":287731,"end":287772},"introduced_by":3}],"inode":{"change":3,"pos":285224}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"e/f/g/h\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"e/f/g/h\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":27,"ins":{"up_context":[{"change":3,"pos":289896}],"down_context":[{"change":3,"pos":289931}],"flag":"","start":1628,"end":1706,"inode":{"change":3,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":289896},"to":{"change":3,"start":289896,"end":289931},"introduced_by":3}],"inode":{"change":3,"pos":289338}},"ins_contents":[{"Add":") -> Result"},{"Add":"where"},{"Add":" R::Error: Send + Sync + 'static,"},{"Add":"{"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":78,"ins":{"up_context":[{"change":3,"pos":291362}],"down_context":[{"change":3,"pos":291397}],"flag":"","start":1707,"end":1785,"inode":{"change":3,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":291362},"to":{"change":3,"start":291362,"end":291397},"introduced_by":3}],"inode":{"change":3,"pos":289338}},"ins_contents":[{"Add":") -> Result"},{"Add":"where"},{"Add":" R::Error: Send + Sync + 'static,"},{"Add":"{"}],"del_contents":[{"Del":") -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":58,"ins":{"up_context":[{"change":3,"pos":293271}],"down_context":[{"change":3,"pos":293305}],"flag":"","start":1786,"end":1844,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":293271},"to":{"change":3,"start":293271,"end":293305},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" .write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" .write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":66,"ins":{"up_context":[{"change":3,"pos":13476}],"down_context":[{"change":3,"pos":13510}],"flag":"","start":1845,"end":1903,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13476},"to":{"change":3,"start":13476,"end":13510},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" .write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" .write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":76,"ins":{"up_context":[{"change":3,"pos":293556}],"down_context":[{"change":3,"pos":293600}],"flag":"","start":1904,"end":1972,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":293556},"to":{"change":3,"start":293556,"end":293600},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":134,"ins":{"up_context":[{"change":3,"pos":294971}],"down_context":[{"change":3,"pos":295011}],"flag":"","start":1973,"end":2037,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":294971},"to":{"change":3,"start":294971,"end":295011},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Edit":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":157,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":295737}],"down_context":[{"change":3,"pos":295737}],"flag":"","start":2038,"end":2365,"inode":{"change":3,"pos":291589}}},"contents":[{"Add":""},{"Add":" crate::unrecord::unrecord(&mut txn_bob, &mut channel_bob, &changes, &alice_h)?;"},{"Add":""},{"Add":" debug_to_file(&txn_bob, &channel_bob, \"debug_bob2_unrec\")?;"},{"Add":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;"},{"Add":""},{"Add":" debug_to_file(&txn_bob, &channel_bob, \"debug_bob2_unrec_app\")?;"},{"Add":" let mut buf = Vec::new();"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":175,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14987},"to":{"change":3,"start":14987,"end":15218},"introduced_by":3}],"inode":{"change":3,"pos":291589}}},"contents":[{"Del":"\n crate::unrecord::unrecord(&mut txn_bob, &mut channel_bob, &changes, &alice_h)?;\n\n debug_to_file(&txn_alice, &channel_alice, \"debug_bob2_unrec\")?;\n apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":176,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":15219},"to":{"change":3,"start":295958,"end":295988},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":295958},"to":{"change":3,"start":295958,"end":295988},"introduced_by":3}],"inode":{"change":3,"pos":291589}}},"contents":[{"Del":" let mut buf = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":193,"ins":{"up_context":[{"change":3,"pos":296530}],"down_context":[{"change":3,"pos":296568}],"flag":"","start":2366,"end":2428,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":296530},"to":{"change":3,"start":296530,"end":296568},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":252,"ins":{"up_context":[{"change":3,"pos":298481}],"down_context":[{"change":3,"pos":298519}],"flag":"","start":2429,"end":2491,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":298481},"to":{"change":3,"start":298481,"end":298519},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":261,"ins":{"up_context":[{"change":3,"pos":298803}],"down_context":[{"change":3,"pos":298843}],"flag":"","start":2492,"end":2556,"inode":{"change":3,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":298803},"to":{"change":3,"start":298803,"end":298843},"introduced_by":3}],"inode":{"change":3,"pos":291589}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":13,"ins":{"up_context":[{"change":3,"pos":300768}],"down_context":[{"change":3,"pos":300852}],"flag":"","start":2557,"end":2681,"inode":{"change":3,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":300768},"to":{"change":3,"start":300768,"end":300852},"introduced_by":3}],"inode":{"change":3,"pos":300430}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |f| {"},{"Add":" Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?)"},{"Add":" })?;"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |f| Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":49,"ins":{"up_context":[{"change":3,"pos":301962}],"down_context":[{"change":3,"pos":302046}],"flag":"","start":2682,"end":2806,"inode":{"change":3,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":301962},"to":{"change":3,"start":301962,"end":302046},"introduced_by":3}],"inode":{"change":3,"pos":300430}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |f| {"},{"Add":" Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?)"},{"Add":" })?;"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |f| Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":118,"ins":{"up_context":[{"change":3,"pos":304454}],"down_context":[{"change":3,"pos":304538}],"flag":"","start":2807,"end":2931,"inode":{"change":3,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":304454},"to":{"change":3,"start":304454,"end":304538},"introduced_by":3}],"inode":{"change":3,"pos":300430}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |f| {"},{"Add":" Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?)"},{"Add":" })?;"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |f| Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":518,"ins":{"up_context":[{"change":3,"pos":321778}],"down_context":[{"change":3,"pos":321822}],"flag":"","start":2932,"end":3000,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":321778},"to":{"change":3,"start":321778,"end":321822},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"a/b/c/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":644,"ins":{"up_context":[{"change":3,"pos":325697}],"down_context":[{"change":3,"pos":325742}],"flag":"","start":3001,"end":3070,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":325697},"to":{"change":3,"start":325697,"end":325742},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/c/file2\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"a/b/c/file2\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":772,"ins":{"up_context":[{"change":3,"pos":329745}],"down_context":[{"change":3,"pos":329789}],"flag":"","start":3071,"end":3139,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":329745},"to":{"change":3,"start":329745,"end":329789},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/d/file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"a/b/d/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":919,"ins":{"up_context":[{"change":3,"pos":334573}],"down_context":[{"change":3,"pos":334617}],"flag":"","start":3140,"end":3208,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":334573},"to":{"change":3,"start":334573,"end":334617},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"a/b/c/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":927,"ins":{"up_context":[{"change":3,"pos":334857}],"down_context":[{"change":3,"pos":334905}],"flag":"","start":3209,"end":3281,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":334857},"to":{"change":3,"start":334857,"end":334905},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_charlie.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {"}],"del_contents":[{"Del":" repo_charlie.write_file(\"a/b/c/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":965,"ins":{"up_context":[{"change":3,"pos":336172}],"down_context":[{"change":3,"pos":336218}],"flag":"","start":3282,"end":3352,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":336172},"to":{"change":3,"start":336172,"end":336218},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"a/b/c/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1430,"ins":{"up_context":[{"change":3,"pos":351252}],"down_context":[{"change":3,"pos":351292}],"flag":"","start":3353,"end":3417,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":351252},"to":{"change":3,"start":351252,"end":351292},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1445,"ins":{"up_context":[{"change":3,"pos":351662}],"down_context":[{"change":3,"pos":351700}],"flag":"","start":3418,"end":3480,"inode":{"change":3,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":351662},"to":{"change":3,"start":351662,"end":351700},"introduced_by":3}],"inode":{"change":3,"pos":305506}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":43,"ins":{"up_context":[{"change":3,"pos":358774}],"down_context":[{"change":3,"pos":358812}],"flag":"","start":3481,"end":3543,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":358774},"to":{"change":3,"start":358774,"end":358812},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":53,"ins":{"up_context":[{"change":3,"pos":359171}],"down_context":[{"change":3,"pos":359211}],"flag":"","start":3544,"end":3608,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":359171},"to":{"change":3,"start":359171,"end":359211},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":103,"ins":{"up_context":[{"change":3,"pos":360763}],"down_context":[{"change":3,"pos":360803}],"flag":"","start":3609,"end":3673,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":360763},"to":{"change":3,"start":360763,"end":360803},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":218,"ins":{"up_context":[{"change":3,"pos":364464}],"down_context":[{"change":3,"pos":364502}],"flag":"","start":3674,"end":3736,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":364464},"to":{"change":3,"start":364464,"end":364502},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":228,"ins":{"up_context":[{"change":3,"pos":364863}],"down_context":[{"change":3,"pos":364905}],"flag":"","start":3737,"end":3803,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":364863},"to":{"change":3,"start":364863,"end":364905},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_charlie.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":242,"ins":{"up_context":[{"change":3,"pos":365222}],"down_context":[{"change":3,"pos":365262}],"flag":"","start":3804,"end":3868,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":365222},"to":{"change":3,"start":365222,"end":365262},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":290,"ins":{"up_context":[{"change":3,"pos":366795}],"down_context":[{"change":3,"pos":366835}],"flag":"","start":3869,"end":3933,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":366795},"to":{"change":3,"start":366795,"end":366835},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":347,"ins":{"up_context":[{"change":3,"pos":368608}],"down_context":[{"change":3,"pos":368646}],"flag":"","start":3934,"end":3996,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":368608},"to":{"change":3,"start":368608,"end":368646},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":428,"ins":{"up_context":[{"change":3,"pos":371225}],"down_context":[{"change":3,"pos":371263}],"flag":"","start":3997,"end":4059,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":371225},"to":{"change":3,"start":371225,"end":371263},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":438,"ins":{"up_context":[{"change":3,"pos":371622}],"down_context":[{"change":3,"pos":371662}],"flag":"","start":4060,"end":4124,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":371622},"to":{"change":3,"start":371622,"end":371662},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":462,"ins":{"up_context":[{"change":3,"pos":372428}],"down_context":[{"change":3,"pos":372468}],"flag":"","start":4125,"end":4189,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":372428},"to":{"change":3,"start":372428,"end":372468},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":547,"ins":{"up_context":[{"change":3,"pos":375120}],"down_context":[{"change":3,"pos":375154}],"flag":"","start":4190,"end":4248,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":375120},"to":{"change":3,"start":375120,"end":375154},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":557,"ins":{"up_context":[{"change":3,"pos":375509}],"down_context":[{"change":3,"pos":375543}],"flag":"","start":4249,"end":4307,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":375509},"to":{"change":3,"start":375509,"end":375543},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":579,"ins":{"up_context":[{"change":3,"pos":376206}],"down_context":[{"change":3,"pos":376240}],"flag":"","start":4308,"end":4366,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":376206},"to":{"change":3,"start":376206,"end":376240},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":676,"ins":{"up_context":[{"change":3,"pos":379318}],"down_context":[{"change":3,"pos":379352}],"flag":"","start":4367,"end":4425,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":379318},"to":{"change":3,"start":379318,"end":379352},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":686,"ins":{"up_context":[{"change":3,"pos":379707}],"down_context":[{"change":3,"pos":379741}],"flag":"","start":4426,"end":4484,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":379707},"to":{"change":3,"start":379707,"end":379741},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":708,"ins":{"up_context":[{"change":3,"pos":380404}],"down_context":[{"change":3,"pos":380438}],"flag":"","start":4485,"end":4543,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":380404},"to":{"change":3,"start":380404,"end":380438},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":800,"ins":{"up_context":[{"change":3,"pos":383330}],"down_context":[{"change":3,"pos":383372}],"flag":"","start":4544,"end":4610,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":383330},"to":{"change":3,"start":383330,"end":383372},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":814,"ins":{"up_context":[{"change":3,"pos":383758}],"down_context":[{"change":3,"pos":383800}],"flag":"","start":4611,"end":4677,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":383758},"to":{"change":3,"start":383758,"end":383800},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":840,"ins":{"up_context":[{"change":3,"pos":384526}],"down_context":[{"change":3,"pos":384560}],"flag":"","start":4678,"end":4736,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":384526},"to":{"change":3,"start":384526,"end":384560},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":940,"ins":{"up_context":[{"change":3,"pos":387750}],"down_context":[{"change":3,"pos":387788}],"flag":"","start":4737,"end":4799,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":387750},"to":{"change":3,"start":387750,"end":387788},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":950,"ins":{"up_context":[{"change":3,"pos":388147}],"down_context":[{"change":3,"pos":388187}],"flag":"","start":4800,"end":4864,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":388147},"to":{"change":3,"start":388147,"end":388187},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":994,"ins":{"up_context":[{"change":3,"pos":389584}],"down_context":[{"change":3,"pos":389624}],"flag":"","start":4865,"end":4929,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":389584},"to":{"change":3,"start":389584,"end":389624},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1076,"ins":{"up_context":[{"change":3,"pos":392201}],"down_context":[{"change":3,"pos":392239}],"flag":"","start":4930,"end":4992,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":392201},"to":{"change":3,"start":392201,"end":392239},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1086,"ins":{"up_context":[{"change":3,"pos":392598}],"down_context":[{"change":3,"pos":392638}],"flag":"","start":4993,"end":5057,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":392598},"to":{"change":3,"start":392598,"end":392638},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1137,"ins":{"up_context":[{"change":3,"pos":394057}],"down_context":[{"change":3,"pos":394097}],"flag":"","start":5058,"end":5122,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":394057},"to":{"change":3,"start":394057,"end":394097},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1214,"ins":{"up_context":[{"change":3,"pos":396429}],"down_context":[{"change":3,"pos":396510}],"flag":"","start":5123,"end":5212,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":396429},"to":{"change":3,"start":396429,"end":396510},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf).unwrap().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":1262,"ins":{"up_context":[{"change":3,"pos":397936}],"down_context":[{"change":3,"pos":398017}],"flag":"","start":5213,"end":5302,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":397936},"to":{"change":3,"start":397936,"end":398017},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf).unwrap().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":1279,"ins":{"up_context":[{"change":3,"pos":398392}],"down_context":[{"change":3,"pos":398474}],"flag":"","start":5303,"end":5386,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":398392},"to":{"change":3,"start":398392,"end":398474},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" Resolve: FnOnce(&[u8], &mut dyn std::io::Write) -> Result<(), std::io::Error>,"}],"del_contents":[{"Del":" Resolve: FnOnce(&[u8], &mut dyn std::io::Write) -> Result<(), anyhow::Error>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1320,"ins":{"up_context":[{"change":3,"pos":399819}],"down_context":[{"change":3,"pos":399857}],"flag":"","start":5387,"end":5449,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":399819},"to":{"change":3,"start":399819,"end":399857},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1330,"ins":{"up_context":[{"change":3,"pos":400216}],"down_context":[{"change":3,"pos":400256}],"flag":"","start":5450,"end":5514,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":400216},"to":{"change":3,"start":400216,"end":400256},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1354,"ins":{"up_context":[{"change":3,"pos":400938}],"down_context":[{"change":3,"pos":400982}],"flag":"","start":5515,"end":5583,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":400938},"to":{"change":3,"start":400938,"end":400982},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |mut w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |mut w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1441,"ins":{"up_context":[{"change":3,"pos":403679}],"down_context":[{"change":3,"pos":403717}],"flag":"","start":5584,"end":5646,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":403679},"to":{"change":3,"start":403679,"end":403717},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1452,"ins":{"up_context":[{"change":3,"pos":404105}],"down_context":[{"change":3,"pos":404145}],"flag":"","start":5647,"end":5711,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":404105},"to":{"change":3,"start":404105,"end":404145},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1475,"ins":{"up_context":[{"change":3,"pos":404838}],"down_context":[{"change":3,"pos":404878}],"flag":"","start":5712,"end":5776,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":404838},"to":{"change":3,"start":404838,"end":404878},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1498,"ins":{"up_context":[{"change":3,"pos":405567}],"down_context":[{"change":3,"pos":405605}],"flag":"","start":5777,"end":5839,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":405567},"to":{"change":3,"start":405567,"end":405605},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1570,"ins":{"up_context":[{"change":3,"pos":407992}],"down_context":[{"change":3,"pos":408034}],"flag":"","start":5840,"end":5906,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":407992},"to":{"change":3,"start":407992,"end":408034},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" .write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" .write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1601,"ins":{"up_context":[{"change":3,"pos":408873}],"down_context":[{"change":3,"pos":408911}],"flag":"","start":5907,"end":5969,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":408873},"to":{"change":3,"start":408873,"end":408911},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1634,"ins":{"up_context":[{"change":3,"pos":409911}],"down_context":[{"change":3,"pos":409949}],"flag":"","start":5970,"end":6032,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":409911},"to":{"change":3,"start":409911,"end":409949},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1710,"ins":{"up_context":[{"change":3,"pos":412397}],"down_context":[{"change":3,"pos":412439}],"flag":"","start":6033,"end":6099,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":412397},"to":{"change":3,"start":412397,"end":412439},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" .write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" .write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1740,"ins":{"up_context":[{"change":3,"pos":413223}],"down_context":[{"change":3,"pos":413261}],"flag":"","start":6100,"end":6162,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":413223},"to":{"change":3,"start":413223,"end":413261},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1768,"ins":{"up_context":[{"change":3,"pos":414157}],"down_context":[{"change":3,"pos":414195}],"flag":"","start":6163,"end":6225,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":414157},"to":{"change":3,"start":414157,"end":414195},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1858,"ins":{"up_context":[{"change":3,"pos":417055}],"down_context":[{"change":3,"pos":417095}],"flag":"","start":6226,"end":6290,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":417055},"to":{"change":3,"start":417055,"end":417095},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1866,"ins":{"up_context":[{"change":3,"pos":417345}],"down_context":[{"change":3,"pos":417383}],"flag":"","start":6291,"end":6353,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":417345},"to":{"change":3,"start":417345,"end":417383},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1874,"ins":{"up_context":[{"change":3,"pos":417630}],"down_context":[{"change":3,"pos":417672}],"flag":"","start":6354,"end":6420,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":417630},"to":{"change":3,"start":417630,"end":417672},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_charlie.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1903,"ins":{"up_context":[{"change":3,"pos":418443}],"down_context":[{"change":3,"pos":418512}],"flag":"","start":6421,"end":6514,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":418443},"to":{"change":3,"start":418443,"end":418512},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| Ok(w.write_all(alice_bob)?))?;"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| Ok(w.write_all(alice_bob)?))?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1991,"ins":{"up_context":[{"change":3,"pos":421584}],"down_context":[{"change":3,"pos":421626}],"flag":"","start":6515,"end":6581,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":421584},"to":{"change":3,"start":421584,"end":421626},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_charlie.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2010,"ins":{"up_context":[{"change":3,"pos":422082}],"down_context":[{"change":3,"pos":422120}],"flag":"","start":6582,"end":6644,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":422082},"to":{"change":3,"start":422082,"end":422120},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2020,"ins":{"up_context":[{"change":3,"pos":422479}],"down_context":[{"change":3,"pos":422519}],"flag":"","start":6645,"end":6709,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":422479},"to":{"change":3,"start":422479,"end":422519},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2044,"ins":{"up_context":[{"change":3,"pos":423310}],"down_context":[{"change":3,"pos":423350}],"flag":"","start":6710,"end":6774,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":423310},"to":{"change":3,"start":423310,"end":423350},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2072,"ins":{"up_context":[{"change":3,"pos":424221}],"down_context":[{"change":3,"pos":424259}],"flag":"","start":6775,"end":6837,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":424221},"to":{"change":3,"start":424221,"end":424259},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2105,"ins":{"up_context":[{"change":3,"pos":425443}],"down_context":[{"change":3,"pos":425481}],"flag":"","start":6838,"end":6900,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":425443},"to":{"change":3,"start":425443,"end":425481},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2194,"ins":{"up_context":[{"change":3,"pos":428215}],"down_context":[{"change":3,"pos":428253}],"flag":"","start":6901,"end":6963,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":428215},"to":{"change":3,"start":428215,"end":428253},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2199,"ins":{"up_context":[{"change":3,"pos":428399}],"down_context":[{"change":3,"pos":428437}],"flag":"","start":6964,"end":7026,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":428399},"to":{"change":3,"start":428399,"end":428437},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2204,"ins":{"up_context":[{"change":3,"pos":428584}],"down_context":[{"change":3,"pos":428622}],"flag":"","start":7027,"end":7089,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":428584},"to":{"change":3,"start":428584,"end":428622},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2212,"ins":{"up_context":[{"change":3,"pos":428861}],"down_context":[{"change":3,"pos":428901}],"flag":"","start":7090,"end":7154,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":428861},"to":{"change":3,"start":428861,"end":428901},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2217,"ins":{"up_context":[{"change":3,"pos":429055}],"down_context":[{"change":3,"pos":429095}],"flag":"","start":7155,"end":7219,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":429055},"to":{"change":3,"start":429055,"end":429095},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2222,"ins":{"up_context":[{"change":3,"pos":429250}],"down_context":[{"change":3,"pos":429290}],"flag":"","start":7220,"end":7284,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":429250},"to":{"change":3,"start":429250,"end":429290},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2248,"ins":{"up_context":[{"change":3,"pos":430232}],"down_context":[{"change":3,"pos":430272}],"flag":"","start":7285,"end":7349,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":430232},"to":{"change":3,"start":430232,"end":430272},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_alice.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2278,"ins":{"up_context":[{"change":3,"pos":431308}],"down_context":[{"change":3,"pos":431346}],"flag":"","start":7350,"end":7412,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":431308},"to":{"change":3,"start":431308,"end":431346},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_bob.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2308,"ins":{"up_context":[{"change":3,"pos":432524}],"down_context":[{"change":3,"pos":432566}],"flag":"","start":7413,"end":7479,"inode":{"change":3,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":432524},"to":{"change":3,"start":432524,"end":432566},"introduced_by":3}],"inode":{"change":3,"pos":357372}},"ins_contents":[{"Add":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo_charlie.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":25,"ins":{"up_context":[{"change":3,"pos":31506}],"down_context":[{"change":3,"pos":442291}],"flag":"","start":7480,"end":7542,"inode":{"change":3,"pos":441393}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":31506},"to":{"change":3,"start":442253,"end":442291},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":442253},"to":{"change":3,"start":442253,"end":442291},"introduced_by":3}],"inode":{"change":3,"pos":441393}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":97,"ins":{"up_context":[{"change":3,"pos":444724}],"down_context":[{"change":3,"pos":444765}],"flag":"","start":7543,"end":7608,"inode":{"change":3,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":444724},"to":{"change":3,"start":444724,"end":444765},"introduced_by":3}],"inode":{"change":3,"pos":441393}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"a/b/c/d\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"a/b/c/d\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":101,"ins":{"up_context":[{"change":3,"pos":444835}],"down_context":[{"change":3,"pos":444876}],"flag":"","start":7609,"end":7674,"inode":{"change":3,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":444835},"to":{"change":3,"start":444835,"end":444876},"introduced_by":3}],"inode":{"change":3,"pos":441393}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"e/f/g/h\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"e/f/g/h\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":446445},"path":"libpijul/src/tests/change.rs","line":18,"ins":{"up_context":[{"change":3,"pos":447015}],"down_context":[{"change":3,"pos":447207}],"flag":"","start":7675,"end":7733,"inode":{"change":3,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":447015},"to":{"change":3,"start":447015,"end":447207},"introduced_by":3}],"inode":{"change":3,"pos":446445}},"ins_contents":[{"Add":" Err(ChangeError::ChangeHashMismatch { .. }) => {}"}],"del_contents":[{"Del":" Err(e) => {\n let e = e.downcast();\n if let Ok(Error::ChangeHashMismatch { .. }) = e {\n } else {\n unreachable!()\n }\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":446445},"path":"libpijul/src/tests/change.rs","line":90,"ins":{"up_context":[{"change":3,"pos":449080}],"down_context":[{"change":3,"pos":449125}],"flag":"","start":7734,"end":7822,"inode":{"change":3,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":449080},"to":{"change":3,"start":449080,"end":449125},"introduced_by":3}],"inode":{"change":3,"pos":446445}},"ins_contents":[{"Add":") -> Result<(Hash, Change), anyhow::Error>"},{"Add":"where"},{"Add":" R::Error: Send + Sync + 'static,"},{"Add":"{"}],"del_contents":[{"Del":") -> Result<(Hash, Change), anyhow::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":446445},"path":"libpijul/src/tests/change.rs","line":143,"ins":{"up_context":[{"change":3,"pos":450786}],"down_context":[{"change":3,"pos":450820}],"flag":"","start":7823,"end":7881,"inode":{"change":3,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":450786},"to":{"change":3,"start":450786,"end":450820},"introduced_by":3}],"inode":{"change":3,"pos":446445}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":206,"ins":{"up_context":[{"change":3,"pos":459870}],"down_context":[{"change":3,"pos":459908}],"flag":"","start":7882,"end":7944,"inode":{"change":3,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":459870},"to":{"change":3,"start":459870,"end":459908},"introduced_by":3}],"inode":{"change":3,"pos":454125}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":235,"ins":{"up_context":[{"change":3,"pos":460858}],"down_context":[{"change":3,"pos":460896}],"flag":"","start":7945,"end":8007,"inode":{"change":3,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":460858},"to":{"change":3,"start":460858,"end":460896},"introduced_by":3}],"inode":{"change":3,"pos":454125}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":240,"ins":{"up_context":[{"change":3,"pos":461035}],"down_context":[{"change":3,"pos":461073}],"flag":"","start":8008,"end":8070,"inode":{"change":3,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":461035},"to":{"change":3,"start":461035,"end":461073},"introduced_by":3}],"inode":{"change":3,"pos":454125}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":247,"ins":{"up_context":[{"change":3,"pos":32166}],"down_context":[{"change":3,"pos":461351}],"flag":"","start":8071,"end":8133,"inode":{"change":3,"pos":454125}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":32166},"to":{"change":3,"start":461313,"end":461351},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":461313},"to":{"change":3,"start":461313,"end":461351},"introduced_by":3}],"inode":{"change":3,"pos":454125}},"ins_contents":[{"Add":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |w| {"}],"del_contents":[{"Del":" repo.write_file(\"dir/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1020742},"path":"libpijul/Cargo.toml","line":122,"ins":{"up_context":[{"change":3,"pos":1023723}],"down_context":[],"flag":"","start":8134,"end":8167,"inode":{"change":3,"pos":1020742}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1023723},"to":{"change":3,"start":1023723,"end":1023741},"introduced_by":3}],"inode":{"change":3,"pos":1020742}},"ins_contents":[{"Add":"env_logger = \"0.8\""},{"Add":"anyhow = \"1.0\""}],"del_contents":[{"Del":"env_logger = \"0.8\""}]}},{"Edit":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":968,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":746}],"down_context":[{"change":11,"pos":757}],"flag":"","start":8168,"end":8179,"inode":{"change":3,"pos":1030385}}},"contents":[{"Add":" \"anyhow\","}]}}],"owner":"irevoire","repo":"pijul","token":"rgJSGqBeKs/vrwSU+CaWSJGRY2qWdWkvCuv6uOT6llQ=","login":null}

…

Dependencies

Change contents