{"header":{"message":"show first line of change message in conflict markers","description":null,"timestamp":"2022-05-20T10:23:40.526195992Z","authors":[{}]},"hash":"GQTC4TJABT3U6DDUBSILVUIGW2XHAHEDDT2QMJYLKT4ONSIV4PRQC","authors":[{"login":"rohan","key":"CTiwcPi7Xhk7tDww87bAGRTQEuzgRxhzSQXqrGNmKmDB"}],"deps":{"hashes":[["GQTC4TJABT3U6DDUBSILVUIGW2XHAHEDDT2QMJYLKT4ONSIV4PRQC","show first line of change message in conflict markers"],["AA",null],["7GQSGIV5ZRNFT4TRZCG6AW54BZTPSSS75O4HQADOVGMYKO7P6GJQC","Fixing conflict identifiers (some nested conflicts were wrong)"],["Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","Fix path prefix striping on Windows."],["PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","Upgrading to Clap 3.0.0-alpha.5"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC","Nicer conflict markers"],["Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","Improving the UI around zombie conflicts"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","Conflict resolution"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["YHG37GA4BELXO4I6TKXMEBIX5MHQT6DWFFFIYYUGLZ4UWCC3NGOQC","Removing one buffer copy in VertexBuffer"],["YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn instead of a simple T"],["DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","address clippy hard errors"],["JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC","Fixing a bug in unrecord"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","remove unneccesary explicit lifetimes"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"]],"deps":["7GQSGIV5ZRNFT4TRZCG6AW54BZTPSSS75O4HQADOVGMYKO7P6GJQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","DNQHXWRZF6EWII3RGQ6HPGFD47BOOFH4FCQHSCACBS3RLQO3DNIQC","WKX5S4Z4DOB5S6A6X5V6ECZFCHQUMWRGX5XT4FBOG57P6HPWK7CAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Y7YAFMFFJY3SQ3GYN3SS4V3FZWMH3B5L65AXQBXOR5XARSMF5JJQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC","Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC","YHG37GA4BELXO4I6TKXMEBIX5MHQT6DWFFFIYYUGLZ4UWCC3NGOQC","YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":178684},"path":"pijul/src/commands/credit.rs","line":7,"ins":{"up_context":[{"change":3,"pos":1431}],"down_context":[{"change":3,"pos":18103}],"flag":"BLOCK","start":0,"end":101,"inode":{"change":3,"pos":178684}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1431},"to":{"change":3,"start":178808,"end":178851},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":178808},"to":{"change":3,"start":178808,"end":178851},"introduced_by":3}],"inode":{"change":3,"pos":178684}},"ins_contents":[{"Add":"use libpijul::changestore::ChangeStore;"},{"Add":"use libpijul::vertex_buffer::{change_message, VertexBuffer};"}],"del_contents":[{"Del":"use libpijul::vertex_buffer::VertexBuffer;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":178684},"path":"pijul/src/commands/credit.rs","line":162,"ins":{"up_context":[{"change":3,"pos":182632}],"down_context":[{"change":3,"pos":31}],"flag":"BLOCK","start":102,"end":149,"inode":{"change":3,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":182632},"to":{"change":3,"start":0,"end":31},"introduced_by":3}],"inode":{"change":3,"pos":178684}},"ins_contents":[{"Add":" fn output_conflict_marker("}],"del_contents":[{"Del":" fn output_conflict_marker(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":178684},"path":"pijul/src/commands/credit.rs","line":166,"ins":{"up_context":[{"change":3,"pos":91}],"down_context":[{"change":3,"pos":116}],"flag":"BLOCK","start":150,"end":189,"inode":{"change":3,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":91},"to":{"change":3,"start":91,"end":116},"introduced_by":3}],"inode":{"change":3,"pos":178684}},"ins_contents":[{"Add":" sides: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" sides: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":178684},"path":"pijul/src/commands/credit.rs","line":172,"ins":{"up_context":[{"change":3,"pos":249}],"down_context":[{"change":3,"pos":371}],"flag":"BLOCK","start":190,"end":628,"inode":{"change":3,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":249},"to":{"change":3,"start":249,"end":370},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":97},"to":{"change":3,"start":182846,"end":182856},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":370},"to":{"change":3,"start":182846,"end":182856},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":182846},"to":{"change":3,"start":182846,"end":182856},"introduced_by":3}],"inode":{"change":3,"pos":178684}},"ins_contents":[{"Add":" match sides {"},{"Add":" Some((changes, sides)) => {"},{"Add":" for side in sides.into_iter() {"},{"Add":" let h = side.to_base32();"},{"Add":" write!("},{"Add":" self.w,"},{"Add":" \" [{} {}]\","},{"Add":" h.split_at(8).0,"},{"Add":" change_message(changes, side)"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"},{"Add":" None => (),"},{"Add":" };"}],"del_contents":[{"Del":" for side in sides {\n let h = side.to_base32();\n write!(self.w, \" [{}]\", h.split_at(8).0)?;\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":1,"ins":{"up_context":[{"change":3,"pos":217202}],"down_context":[{"change":3,"pos":217282}],"flag":"BLOCK","start":629,"end":681,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":217258},"to":{"change":3,"start":217258,"end":217282},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":"use crate::{changestore::ChangeStore, pristine::*};"}],"del_contents":[{"Del":"use crate::pristine::*;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":19,"ins":{"up_context":[{"change":3,"pos":217953}],"down_context":[{"change":3,"pos":691}],"flag":"BLOCK","start":682,"end":729,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":217953},"to":{"change":3,"start":660,"end":691},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn output_conflict_marker("}],"del_contents":[{"Del":" fn output_conflict_marker(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":23,"ins":{"up_context":[{"change":3,"pos":746}],"down_context":[{"change":3,"pos":771}],"flag":"BLOCK","start":730,"end":769,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":746},"to":{"change":3,"start":746,"end":771},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" sides: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" sides: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":25,"ins":{"up_context":[{"change":3,"pos":808}],"down_context":[{"change":3,"pos":900}],"flag":"BLOCK","start":770,"end":923,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":808},"to":{"change":3,"start":808,"end":900},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_conflict("},{"Add":" &mut self,"},{"Add":" id: usize,"},{"Add":" side: Option<(&C, &[&Hash])>,"},{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_conflict(&mut self, id: usize, side: &[&Hash]) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":32,"ins":{"up_context":[{"change":3,"pos":218153}],"down_context":[{"change":3,"pos":991}],"flag":"BLOCK","start":924,"end":970,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":218153},"to":{"change":3,"start":961,"end":991},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_zombie_conflict("}],"del_contents":[{"Del":" fn begin_zombie_conflict(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":35,"ins":{"up_context":[{"change":3,"pos":1029}],"down_context":[{"change":3,"pos":1056}],"flag":"BLOCK","start":971,"end":1012,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1029},"to":{"change":3,"start":1029,"end":1056},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" add_del: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" add_del: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":39,"ins":{"up_context":[{"change":3,"pos":218260}],"down_context":[{"change":3,"pos":218361}],"flag":"BLOCK","start":1013,"end":1177,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":218260},"to":{"change":3,"start":1158,"end":1300},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"},{"Add":" self.output_conflict_marker::(START_MARKER, id, None)"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n self.output_conflict_marker(START_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":42,"ins":{"up_context":[{"change":3,"pos":218367}],"down_context":[{"change":3,"pos":1392}],"flag":"BLOCK","start":1178,"end":1330,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":218367},"to":{"change":3,"start":1301,"end":1392},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn conflict_next("},{"Add":" &mut self,"},{"Add":" id: usize,"},{"Add":" side: Option<(&C, &[&Hash])>,"},{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn conflict_next(&mut self, id: usize, side: &[&Hash]) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":49,"ins":{"up_context":[{"change":3,"pos":218483}],"down_context":[{"change":3,"pos":218593}],"flag":"BLOCK","start":1331,"end":1484,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":218483},"to":{"change":3,"start":1450,"end":1581},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"},{"Add":" self.output_conflict_marker::(END_MARKER, id, None)"}],"del_contents":[{"Del":" fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n self.output_conflict_marker(END_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":52,"ins":{"up_context":[{"change":3,"pos":218599}],"down_context":[{"change":3,"pos":218716}],"flag":"BLOCK","start":1485,"end":1617,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":218599},"to":{"change":3,"start":1582,"end":1693},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn end_zombie_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"},{"Add":" self.end_conflict::(id)"}],"del_contents":[{"Del":" fn end_zombie_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n self.end_conflict(id)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":55,"ins":{"up_context":[{"change":3,"pos":218722}],"down_context":[{"change":3,"pos":218839}],"flag":"BLOCK","start":1618,"end":1778,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":218722},"to":{"change":3,"start":1694,"end":1832},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn end_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"},{"Add":" self.output_conflict_marker::(END_MARKER, id, None)"}],"del_contents":[{"Del":" fn end_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n self.output_conflict_marker(END_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":115,"ins":{"up_context":[{"change":3,"pos":220451}],"down_context":[{"change":3,"pos":1864}],"flag":"BLOCK","start":1779,"end":1826,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":220451},"to":{"change":3,"start":1833,"end":1864},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn output_conflict_marker("}],"del_contents":[{"Del":" fn output_conflict_marker(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":119,"ins":{"up_context":[{"change":3,"pos":1919}],"down_context":[{"change":3,"pos":1944}],"flag":"BLOCK","start":1827,"end":1866,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1919},"to":{"change":3,"start":1919,"end":1944},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" sides: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" sides: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":130,"ins":{"up_context":[{"change":3,"pos":2115}],"down_context":[{"change":3,"pos":2237}],"flag":"BLOCK","start":1867,"end":2293,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2115},"to":{"change":3,"start":2115,"end":2236},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":195},"to":{"change":3,"start":220833,"end":220843},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2236},"to":{"change":3,"start":220833,"end":220843},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":220833},"to":{"change":3,"start":220833,"end":220843},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" match sides {"},{"Add":" Some((changes, sides)) => {"},{"Add":" for side in sides {"},{"Add":" let h = side.to_base32();"},{"Add":" write!("},{"Add":" self.w,"},{"Add":" \" [{} {}]\","},{"Add":" h.split_at(8).0,"},{"Add":" change_message(changes, side)"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"},{"Add":" None => (),"},{"Add":" };"}],"del_contents":[{"Del":" for side in sides {\n let h = side.to_base32();\n write!(self.w, \" [{}]\", h.split_at(8).0)?;\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":149,"ins":{"up_context":[{"change":3,"pos":220895}],"down_context":[{"change":3,"pos":220959}],"flag":"BLOCK","start":2294,"end":2448,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":220895},"to":{"change":3,"start":2272,"end":2364},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_conflict("},{"Add":" &mut self,"},{"Add":" id: usize,"},{"Add":" sides: Option<(&C, &[&Hash])>,"},{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_conflict(&mut self, id: usize, side: &[&Hash]) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":158,"ins":{"up_context":[{"change":3,"pos":221103}],"down_context":[{"change":3,"pos":221153}],"flag":"BLOCK","start":2449,"end":2510,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":221103},"to":{"change":3,"start":2365,"end":2425},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" self.output_conflict_marker(START_MARKER, id, sides)"}],"del_contents":[{"Del":" self.output_conflict_marker(START_MARKER, id, side)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":160,"ins":{"up_context":[{"change":3,"pos":221159}],"down_context":[{"change":3,"pos":2456}],"flag":"BLOCK","start":2511,"end":2557,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":221159},"to":{"change":3,"start":2426,"end":2456},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_zombie_conflict("}],"del_contents":[{"Del":" fn begin_zombie_conflict(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":163,"ins":{"up_context":[{"change":3,"pos":2494}],"down_context":[{"change":3,"pos":2521}],"flag":"BLOCK","start":2558,"end":2599,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2494},"to":{"change":3,"start":2494,"end":2521},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" add_del: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" add_del: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":171,"ins":{"up_context":[{"change":3,"pos":221431}],"down_context":[{"change":3,"pos":221502}],"flag":"BLOCK","start":2600,"end":2699,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":221431},"to":{"change":3,"start":2624,"end":2707},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":176,"ins":{"up_context":[{"change":3,"pos":221647}],"down_context":[{"change":3,"pos":221697}],"flag":"BLOCK","start":2700,"end":2996,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":221647},"to":{"change":3,"start":2708,"end":2767},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" self.output_conflict_marker::(START_MARKER, id, None)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn change_message(changes: &C, hash: &Hash) -> String {"},{"Add":" match changes.get_header(hash) {"},{"Add":" Ok(header) => header.message.lines().next().unwrap().to_string(),"},{"Add":" Err(_e) => \"\".to_string(),"}],"del_contents":[{"Del":" self.output_conflict_marker(START_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":240,"ins":{"up_context":[{"change":3,"pos":222923}],"down_context":[{"change":3,"pos":2799}],"flag":"BLOCK","start":2997,"end":3044,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":222923},"to":{"change":3,"start":2768,"end":2799},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn output_conflict_marker("}],"del_contents":[{"Del":" fn output_conflict_marker(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":244,"ins":{"up_context":[{"change":3,"pos":2854}],"down_context":[{"change":3,"pos":2879}],"flag":"BLOCK","start":3045,"end":3084,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2854},"to":{"change":3,"start":2854,"end":2879},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" sides: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" sides: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":251,"ins":{"up_context":[{"change":3,"pos":3007}],"down_context":[{"change":3,"pos":3129}],"flag":"BLOCK","start":3085,"end":3511,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3007},"to":{"change":3,"start":3007,"end":3128},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":293},"to":{"change":3,"start":223247,"end":223257},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":3128},"to":{"change":3,"start":223247,"end":223257},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":223247},"to":{"change":3,"start":223247,"end":223257},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" match sides {"},{"Add":" Some((changes, sides)) => {"},{"Add":" for side in sides {"},{"Add":" let h = side.to_base32();"},{"Add":" write!("},{"Add":" self.w,"},{"Add":" \" [{} {}]\","},{"Add":" h.split_at(8).0,"},{"Add":" change_message(changes, side)"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"},{"Add":" None => (),"},{"Add":" };"}],"del_contents":[{"Del":" for side in sides {\n let h = side.to_base32();\n write!(self.w, \" [{}]\", h.split_at(8).0)?;\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":269,"ins":{"up_context":[{"change":3,"pos":223279}],"down_context":[{"change":3,"pos":3256}],"flag":"BLOCK","start":3512,"end":3665,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":223279},"to":{"change":3,"start":3164,"end":3256},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_conflict("},{"Add":" &mut self,"},{"Add":" id: usize,"},{"Add":" side: Option<(&C, &[&Hash])>,"},{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_conflict(&mut self, id: usize, side: &[&Hash]) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":276,"ins":{"up_context":[{"change":3,"pos":223399}],"down_context":[{"change":3,"pos":134}],"flag":"BLOCK","start":3666,"end":3756,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":223399},"to":{"change":3,"start":3317,"end":3391},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":278,"ins":{"up_context":[{"change":3,"pos":166}],"down_context":[{"change":3,"pos":214}],"flag":"BLOCK","start":3757,"end":3820,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":166},"to":{"change":3,"start":3392,"end":3449},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" self.output_conflict_marker::(END_MARKER, id, None)"}],"del_contents":[{"Del":" self.output_conflict_marker(END_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":280,"ins":{"up_context":[{"change":3,"pos":220}],"down_context":[{"change":3,"pos":3480}],"flag":"BLOCK","start":3821,"end":3867,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":220},"to":{"change":3,"start":3450,"end":3480},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_zombie_conflict("}],"del_contents":[{"Del":" fn begin_zombie_conflict(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":283,"ins":{"up_context":[{"change":3,"pos":3518}],"down_context":[{"change":3,"pos":3545}],"flag":"BLOCK","start":3868,"end":3909,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3518},"to":{"change":3,"start":3518,"end":3545},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" add_del: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" add_del: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":292,"ins":{"up_context":[{"change":3,"pos":370}],"down_context":[{"change":3,"pos":440}],"flag":"BLOCK","start":3910,"end":4007,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":370},"to":{"change":3,"start":3652,"end":3733},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn end_zombie_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_zombie_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":294,"ins":{"up_context":[{"change":3,"pos":472}],"down_context":[{"change":3,"pos":223520}],"flag":"BLOCK","start":4008,"end":4071,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":472},"to":{"change":3,"start":3734,"end":3791},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" self.output_conflict_marker::(END_MARKER, id, None)"}],"del_contents":[{"Del":" self.output_conflict_marker(END_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":296,"ins":{"up_context":[{"change":3,"pos":223526}],"down_context":[{"change":3,"pos":223647}],"flag":"BLOCK","start":4072,"end":4236,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":223526},"to":{"change":3,"start":3792,"end":3934},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"},{"Add":" self.output_conflict_marker::(START_MARKER, id, None)"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n self.output_conflict_marker(START_MARKER, id, &[])\n"}]}},{"Edit":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":768903}],"down_context":[{"change":3,"pos":768959}],"flag":"BLOCK","start":4237,"end":4274,"inode":{"change":3,"pos":768903}}},"contents":[{"Add":"use crate::changestore::ChangeStore;"}]}},{"Edit":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":769009}],"down_context":[{"change":21,"pos":85410}],"flag":"BLOCK","start":4275,"end":4317,"inode":{"change":3,"pos":768903}}},"contents":[{"Add":"use crate::vertex_buffer::change_message;"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":157,"ins":{"up_context":[{"change":3,"pos":32714}],"down_context":[{"change":3,"pos":774201}],"flag":"BLOCK","start":4318,"end":4471,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32714},"to":{"change":3,"start":3935,"end":4027},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn begin_conflict("},{"Add":" &mut self,"},{"Add":" id: usize,"},{"Add":" side: Option<(&C, &[&Hash])>,"},{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_conflict(&mut self, id: usize, side: &[&Hash]) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":166,"ins":{"up_context":[{"change":3,"pos":774324}],"down_context":[{"change":3,"pos":774395}],"flag":"BLOCK","start":4472,"end":4571,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":774324},"to":{"change":3,"start":4104,"end":4187},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn begin_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":170,"ins":{"up_context":[{"change":3,"pos":774541}],"down_context":[{"change":3,"pos":774606}],"flag":"BLOCK","start":4572,"end":4652,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":774541},"to":{"change":3,"start":4188,"end":4262},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" self.output_conflict_marker::(vertex_buffer::START_MARKER, id, None)"}],"del_contents":[{"Del":" self.output_conflict_marker(vertex_buffer::START_MARKER, id, &[])\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":173,"ins":{"up_context":[{"change":3,"pos":774613}],"down_context":[{"change":3,"pos":4293}],"flag":"BLOCK","start":4653,"end":4699,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":774613},"to":{"change":3,"start":4263,"end":4293},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn begin_zombie_conflict("}],"del_contents":[{"Del":" fn begin_zombie_conflict(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":176,"ins":{"up_context":[{"change":3,"pos":4331}],"down_context":[{"change":3,"pos":4358}],"flag":"BLOCK","start":4700,"end":4741,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4331},"to":{"change":3,"start":4331,"end":4358},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" add_del: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" add_del: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":182,"ins":{"up_context":[{"change":3,"pos":32927}],"down_context":[{"change":3,"pos":774928}],"flag":"BLOCK","start":4742,"end":4832,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":32927},"to":{"change":3,"start":4476,"end":4550},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":191,"ins":{"up_context":[{"change":3,"pos":775223}],"down_context":[{"change":3,"pos":775288}],"flag":"BLOCK","start":4833,"end":4913,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":775223},"to":{"change":3,"start":4551,"end":4625},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" self.output_conflict_marker::(vertex_buffer::END_MARKER, id, None)?;"}],"del_contents":[{"Del":" self.output_conflict_marker(vertex_buffer::END_MARKER, id, &[])?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":198,"ins":{"up_context":[{"change":3,"pos":775540}],"down_context":[{"change":3,"pos":775609}],"flag":"BLOCK","start":4914,"end":5011,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":775540},"to":{"change":3,"start":4626,"end":4707},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn end_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn end_cyclic_conflict(&mut self, id: usize) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":200,"ins":{"up_context":[{"change":3,"pos":775648}],"down_context":[{"change":3,"pos":775678}],"flag":"BLOCK","start":5012,"end":5049,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":775648},"to":{"change":3,"start":4708,"end":4740},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" self.end_conflict::(id)?;"}],"del_contents":[{"Del":" self.end_conflict(id)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":205,"ins":{"up_context":[{"change":3,"pos":33063}],"down_context":[{"change":3,"pos":775903}],"flag":"BLOCK","start":5050,"end":5202,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33063},"to":{"change":3,"start":4741,"end":4832},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn conflict_next("},{"Add":" &mut self,"},{"Add":" id: usize,"},{"Add":" side: Option<(&C, &[&Hash])>,"},{"Add":" ) -> Result<(), std::io::Error> {"}],"del_contents":[{"Del":" fn conflict_next(&mut self, id: usize, side: &[&Hash]) -> Result<(), std::io::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":222,"ins":{"up_context":[{"change":3,"pos":33129}],"down_context":[{"change":3,"pos":4937}],"flag":"BLOCK","start":5203,"end":5250,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33129},"to":{"change":3,"start":4906,"end":4937},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" fn output_conflict_marker("}],"del_contents":[{"Del":" fn output_conflict_marker(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":226,"ins":{"up_context":[{"change":3,"pos":4997}],"down_context":[{"change":3,"pos":5022}],"flag":"BLOCK","start":5251,"end":5290,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4997},"to":{"change":3,"start":4997,"end":5022},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" sides: Option<(&C, &[&Hash])>,"}],"del_contents":[{"Del":" sides: &[&Hash],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":768903},"path":"libpijul/src/diff/vertex_buffer.rs","line":243,"ins":{"up_context":[{"change":3,"pos":5318}],"down_context":[{"change":3,"pos":5458}],"flag":"BLOCK","start":5291,"end":5726,"inode":{"change":3,"pos":768903}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5318},"to":{"change":3,"start":5318,"end":5458},"introduced_by":3}],"inode":{"change":3,"pos":768903}},"ins_contents":[{"Add":" match sides {"},{"Add":" Some((changes, sides)) => {"},{"Add":" for side in sides {"},{"Add":" let h = side.to_base32();"},{"Add":" write!("},{"Add":" self.contents_a,"},{"Add":" \" [{} {}]\","},{"Add":" h.split_at(8).0,"},{"Add":" change_message(changes, side)"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"},{"Add":" None => (),"},{"Add":" };"}],"del_contents":[{"Del":" for side in sides {\n let h = side.to_base32();\n write!(self.contents_a, \" [{}]\", h.split_at(8).0)?;\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":64,"ins":{"up_context":[{"change":3,"pos":5956}],"down_context":[{"change":3,"pos":6022}],"flag":"BLOCK","start":5727,"end":5810,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5956},"to":{"change":3,"start":5956,"end":6022},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.begin_conflict(id, Some((changes, &[&ext.into()])))?;"}],"del_contents":[{"Del":" line_buf.begin_conflict(id, &[&ext.into()])?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":67,"ins":{"up_context":[{"change":3,"pos":6063}],"down_context":[{"change":3,"pos":6118}],"flag":"BLOCK","start":5811,"end":5872,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6063},"to":{"change":3,"start":6063,"end":6118},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.begin_conflict::

(id, None)?;"}],"del_contents":[{"Del":" line_buf.begin_conflict(id, &[])?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":76,"ins":{"up_context":[{"change":3,"pos":6225}],"down_context":[{"change":3,"pos":662}],"flag":"BLOCK","start":5873,"end":5933,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6225},"to":{"change":3,"start":6225,"end":6280},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.end_zombie_conflict::

(id)?;"}],"del_contents":[{"Del":" line_buf.end_zombie_conflict(id)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":83,"ins":{"up_context":[{"change":3,"pos":6529}],"down_context":[{"change":3,"pos":6599}],"flag":"BLOCK","start":5934,"end":6024,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6529},"to":{"change":2,"start":32,"end":105},"introduced_by":2}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.conflict_next(elt.id, Some((changes, &[&ext.into()])))?;"}],"del_contents":[{"Del":" line_buf.conflict_next(elt.id, &[&ext.into()])?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":86,"ins":{"up_context":[{"change":3,"pos":6648}],"down_context":[{"change":3,"pos":6707}],"flag":"BLOCK","start":6025,"end":6093,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6648},"to":{"change":2,"start":106,"end":168},"introduced_by":2}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.conflict_next::

(elt.id, None)?;"}],"del_contents":[{"Del":" line_buf.conflict_next(elt.id, &[])?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":125,"ins":{"up_context":[{"change":3,"pos":7130}],"down_context":[{"change":3,"pos":901}],"flag":"BLOCK","start":6094,"end":6154,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7130},"to":{"change":3,"start":7130,"end":7185},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.end_zombie_conflict::

(elt.id)?;"}],"del_contents":[{"Del":" line_buf.end_conflict(elt.id)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":131,"ins":{"up_context":[{"change":3,"pos":7281}],"down_context":[{"change":3,"pos":1031}],"flag":"BLOCK","start":6209,"end":6265,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7281},"to":{"change":3,"start":7281,"end":7332},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" line_buf.end_zombie_conflict::

(*id)?;"}],"del_contents":[{"Del":" vbuf.begin_cyclic_conflict(*id)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":215,"ins":{"up_context":[{"change":3,"pos":7718}],"down_context":[{"change":3,"pos":7785}],"flag":"BLOCK","start":6363,"end":6447,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7718},"to":{"change":3,"start":7718,"end":7785},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" vbuf.begin_zombie_conflict(*id, Some((changes, &[&hash.into()])))?;"}],"del_contents":[{"Del":" vbuf.begin_zombie_conflict(*id, &[&hash.into()])?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":219,"ins":{"up_context":[{"change":3,"pos":7863}],"down_context":[{"change":3,"pos":993348}],"flag":"BLOCK","start":6448,"end":6496,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7863},"to":{"change":3,"start":7863,"end":7906},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" vbuf.end_zombie_conflict::

(id)?;"}],"del_contents":[{"Del":" vbuf.end_zombie_conflict(id)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":988425},"path":"libpijul/src/alive/output.rs","line":246,"ins":{"up_context":[{"change":3,"pos":994106}],"down_context":[{"change":3,"pos":994143}],"flag":"BLOCK","start":6497,"end":6548,"inode":{"change":3,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":994106},"to":{"change":3,"start":7907,"end":7953},"introduced_by":3}],"inode":{"change":3,"pos":988425}},"ins_contents":[{"Add":" vbuf.end_cyclic_conflict::

(id_cyclic)?;"}],"del_contents":[{"Del":" vbuf.end_cyclic_conflict(id_cyclic)?;\n"}]}}],"owner":"laumann","repo":"pijul","token":"0OY7HuqrpHavPpvWFWrE2OW79xDwZLqOkXLTl3JPwxA=","login":null}

…

Dependencies

Change contents