{"header":{"message":"Fixing the stitching in cyclic conflict","description":"Stitching is when we use pseudo-edges to reconnect alive parts which may have been separated by a deletion. One of our test cases showed that this wasn't working well in the case of cyclic conflicts.\n\nThat particular test case is probably the worst thing imaginable, since it manages to create a cyclic + zombie conflict between the empty vertices used to solve regular order conflicts.\n","timestamp":"2026-01-18T18:22:29.507131712Z","authors":[{}]},"hash":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC","authors":[{"login":"pmeunier","key":"8ES6e1QmLjuQn1DzS2DQRKebzCKPHpdf4E9hfwMqQoe7"}],"deps":{"hashes":[["FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC","Fixing the stitching in cyclic conflict"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["55SCQOOHI4VRYNKPKDV5PVDXZIY4DG6URA2TMBLQGYLNI6YC7XHAC","Fixing the tests"],["43SISRQ4CLKXN5YVFAGWUU3OJBT2TX6QXWWER33ONLEITSCFCUBAC","Formatting"],["ZJWCPRMHAYZYGCPYBTBIPBBFVCVDSFNGUL36HMC2DHCWZZKNA7PAC","Fixing known patches in deleted contexts"],["MQ6ERQ43MWASF2OSG65FHKWHCWT35BJVFJWKHAFPVCTLICCTJWUAC","Bug fixes when unrecording a patch that introduced zombie files"],["H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC","Mixed zombie/order conflicts: fixing the bottom vertex"],["HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC","Fixing a bug in unrecord"],["OXZVZDQZEVP7NV3HS6HK5QA7RUD35ODVQ3LL7PWJHTS7DEFM3XTAC","Simplification of missing context repairs"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","Formatting + big-endian Sanakirja"],["U2CGP7OPHQZNAAPWCRSFVZQWXFRVCB2NC3APRA7ACQJZBIVBE6IQC","Record a separate change for Hunk::AddRoot, to avoid #571"],["V3HHWF4Q5GNB3EAIVEBF274OZ4VNC2MFP25CLLRRCQUA2PGDJMQQC","Commit function in libpijul"]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","55SCQOOHI4VRYNKPKDV5PVDXZIY4DG6URA2TMBLQGYLNI6YC7XHAC","43SISRQ4CLKXN5YVFAGWUU3OJBT2TX6QXWWER33ONLEITSCFCUBAC","ZJWCPRMHAYZYGCPYBTBIPBBFVCVDSFNGUL36HMC2DHCWZZKNA7PAC","MQ6ERQ43MWASF2OSG65FHKWHCWT35BJVFJWKHAFPVCTLICCTJWUAC","H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC","HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC"],"known":["V3HHWF4Q5GNB3EAIVEBF274OZ4VNC2MFP25CLLRRCQUA2PGDJMQQC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","U2CGP7OPHQZNAAPWCRSFVZQWXFRVCB2NC3APRA7ACQJZBIVBE6IQC","OXZVZDQZEVP7NV3HS6HK5QA7RUD35ODVQ3LL7PWJHTS7DEFM3XTAC","QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC"]},"hunks":[{"Edit":{"inode":{"change":2,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2538,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":433351}],"down_context":[{"change":7,"pos":78092}],"flag":"BLOCK","start":0,"end":220,"inode":{"change":2,"pos":357372}}},"contents":[{"Add":{"text":"","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:0"}},{"Add":{"text":" {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:6"}},{"Add":{"text":" let txn = txn.read();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:36"}},{"Add":{"text":" let graph = channel_bob.read();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:76"}},{"Add":{"text":" let mut f = std::fs::File::create(\"bob0\").unwrap();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:136"}},{"Add":{"text":" crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:213"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:219"}}]}},{"Edit":{"inode":{"change":2,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2546,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":78172}],"down_context":[{"change":8,"pos":10475}],"flag":"BLOCK","start":221,"end":441,"inode":{"change":2,"pos":357372}}},"contents":[{"Add":{"text":"","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:221"}},{"Add":{"text":" {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:227"}},{"Add":{"text":" let txn = txn.read();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:257"}},{"Add":{"text":" let graph = channel_bob.read();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:297"}},{"Add":{"text":" let mut f = std::fs::File::create(\"bob1\").unwrap();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:357"}},{"Add":{"text":" crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:434"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:440"}}]}},{"Replacement":{"inode":{"change":2,"pos":717381},"path":"libpijul/src/lib.rs","line":84,"ins":{"up_context":[{"change":2,"pos":720384}],"down_context":[{"change":2,"pos":720536}],"flag":"BLOCK","start":442,"end":846,"inode":{"change":2,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":720384},"to":{"change":2,"start":720384,"end":720536},"introduced_by":2}],"inode":{"change":2,"pos":717381}},"ins_contents":[{"Add":{"text":"impl<","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:447"}},{"Add":{"text":" T: ::sanakirja::LoadPage","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:508"}},{"Add":{"text":" + ::sanakirja::RootPageMut","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:547"}},{"Add":{"text":" + ::sanakirja::Commit","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:581"}},{"Add":{"text":" + ::sanakirja::AllocPage,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:647"}},{"Add":{"text":" > MutTxnTExt for pristine::sanakirja::GenericTxn","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:703"}},{"Add":{"text":"{","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:705"}},{"Add":{"text":"}","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:707"}},{"Add":{"text":"impl + ::sanakirja::RootPage> TxnTExt","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:798"}},{"Add":{"text":" for pristine::sanakirja::GenericTxn","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:841"}},{"Add":{"text":"{","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:843"}},{"Add":{"text":"}","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:845"}}],"del_contents":[{"Del":{"text":"impl MutTxnTExt for pristine::sanakirja::MutTxn<()> {}","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:720438"}},{"Del":{"text":"impl TxnTExt for pristine::sanakirja::MutTxn<()> {}","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:720490"}},{"Del":{"text":"impl TxnTExt for pristine::sanakirja::Txn {}","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:720535"}}]}},{"Replacement":{"inode":{"change":2,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":133,"ins":{"up_context":[{"change":2,"pos":809674}],"down_context":[{"change":3,"pos":1308}],"flag":"BLOCK","start":847,"end":863,"inode":{"change":2,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":809674},"to":{"change":5,"start":116879,"end":116894},"introduced_by":5}],"inode":{"change":2,"pos":805350}},"ins_contents":[{"Add":{"text":" )?;","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:862"}}],"del_contents":[{"Del":{"text":" )?","pos":"CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC:116893"}}]}},{"Replacement":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":602,"ins":{"up_context":[{"change":12,"pos":821}],"down_context":[{"change":12,"pos":1066}],"flag":"BLOCK","start":864,"end":1415,"inode":{"change":2,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":821},"to":{"change":13,"start":7152,"end":7199},"introduced_by":13},{"previous":"","flag":"DELETED","from":{"change":13,"pos":7199},"to":{"change":12,"start":821,"end":1066},"introduced_by":13},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":821},"to":{"change":12,"start":821,"end":1066},"introduced_by":12}],"inode":{"change":2,"pos":944089}},"ins_contents":[{"Add":{"text":" debug!(\"put_pseudo, descendant {:?} {:?}\", elt.last_alive, r);","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:942"}},{"Add":{"text":" // If we aren't in a direct cycle, reconnect.","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1004"}},{"Add":{"text":" if elt.last_alive != *r {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1046"}},{"Add":{"text":" put_graph_with_rev(","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1086"}},{"Add":{"text":" txn,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1115"}},{"Add":{"text":" channel,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1148"}},{"Add":{"text":" EdgeFlags::PSEUDO,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1191"}},{"Add":{"text":" elt.last_alive,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1231"}},{"Add":{"text":" *r,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1259"}},{"Add":{"text":" ChangeId::ROOT,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1299"}},{"Add":{"text":" )?;","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1323"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1341"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1355"}},{"Add":{"text":" if !elt.is_alive() {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1388"}},{"Add":{"text":" continue;","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1414"}}],"del_contents":[{"Del":{"text":" debug!(\"descendant {:#?}\", r);","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7198"}},{"Del":{"text":" put_graph_with_rev(","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:856"}},{"Del":{"text":" txn,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:881"}},{"Del":{"text":" channel,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:910"}},{"Del":{"text":" EdgeFlags::PSEUDO,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:949"}},{"Del":{"text":" elt.last_alive,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:985"}},{"Del":{"text":" *r,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:1009"}},{"Del":{"text":" ChangeId::ROOT,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:1045"}},{"Del":{"text":" )?;","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:1065"}}]}},{"Replacement":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":626,"ins":{"up_context":[{"change":13,"pos":7529}],"down_context":[{"change":13,"pos":8249}],"flag":"BLOCK","start":1416,"end":2359,"inode":{"change":2,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":13,"pos":7529},"to":{"change":13,"start":7529,"end":8249},"introduced_by":13}],"inode":{"change":2,"pos":944089}},"ins_contents":[{"Add":{"text":" if v.vertex != elt.vertex {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1467"}},{"Add":{"text":" // We need to reconnect, and we can do it now","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1541"}},{"Add":{"text":" // since we won't have a chance to visit that","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1615"}},{"Add":{"text":" // edge (because non-PARENT edge we are","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1683"}},{"Add":{"text":" // inserting now starts from a vertex that is","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1757"}},{"Add":{"text":" // on the path, which means we've already","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1827"}},{"Add":{"text":" // pushed all its children onto the stack.).","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1900"}},{"Add":{"text":" debug!(\"alive, put_pseudo {:?} {:?}\", v.vertex, elt.vertex);","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:1989"}},{"Add":{"text":" put_graph_with_rev(","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2037"}},{"Add":{"text":" txn,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2074"}},{"Add":{"text":" channel,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2115"}},{"Add":{"text":" EdgeFlags::PSEUDO,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2166"}},{"Add":{"text":" v.vertex,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2208"}},{"Add":{"text":" elt.vertex,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2252"}},{"Add":{"text":" ChangeId::ROOT,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2300"}},{"Add":{"text":" )?;","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2332"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2358"}}],"del_contents":[{"Del":{"text":" // We need to reconnect, and we can do it now","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7598"}},{"Del":{"text":" // since we won't have a chance to visit that","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7668"}},{"Del":{"text":" // edge (because non-PARENT edge we are","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7732"}},{"Del":{"text":" // inserting now starts from a vertex that is","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7802"}},{"Del":{"text":" // on the path, which means we've already","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7868"}},{"Del":{"text":" // pushed all its children onto the stack.).","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7937"}},{"Del":{"text":" put_graph_with_rev(","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:7981"}},{"Del":{"text":" txn,","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8014"}},{"Del":{"text":" channel,","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8051"}},{"Del":{"text":" EdgeFlags::PSEUDO,","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8098"}},{"Del":{"text":" v.vertex,","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8136"}},{"Del":{"text":" elt.vertex,","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8176"}},{"Del":{"text":" ChangeId::ROOT,","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8220"}},{"Del":{"text":" )?;","pos":"HP7CKJIW6TOQZFAZKKJFF76LGE7EMQVDTRH2RWPM4POIG2WRKHBAC:8248"}}]}},{"Replacement":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":712,"ins":{"up_context":[{"change":12,"pos":2810}],"down_context":[{"change":13,"pos":8605}],"flag":"BLOCK","start":2360,"end":2454,"inode":{"change":2,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":2810},"to":{"change":12,"start":2810,"end":2971},"introduced_by":12}],"inode":{"change":2,"pos":944089}},"ins_contents":[{"Add":{"text":" debug!(","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2391"}},{"Add":{"text":" \"put_pseudo, alive 2, {:?} {:?}\",","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2453"}}],"del_contents":[{"Del":{"text":" put_graph_with_rev(","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:2853"}},{"Del":{"text":" txn,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:2886"}},{"Del":{"text":" channel,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:2923"}},{"Del":{"text":" EdgeFlags::PSEUDO,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:2970"}}]}},{"Replacement":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":715,"ins":{"up_context":[{"change":13,"pos":8647}],"down_context":[{"change":12,"pos":3138}],"flag":"BLOCK","start":2455,"end":3501,"inode":{"change":2,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":13,"pos":8647},"to":{"change":12,"start":3015,"end":3138},"introduced_by":13},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":12,"pos":3015},"to":{"change":12,"start":3015,"end":3138},"introduced_by":12}],"inode":{"change":2,"pos":944089}},"ins_contents":[{"Add":{"text":" stack[len - 1].vertex","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2504"}},{"Add":{"text":" );","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2531"}},{"Add":{"text":" debug!(\"{:?}\", stack);","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2578"}},{"Add":{"text":" let edge = Edge {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2620"}},{"Add":{"text":" dest: stack[len - 1].vertex.start_pos(),","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2689"}},{"Add":{"text":" flag: EdgeFlags::empty(),","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2743"}},{"Add":{"text":" introduced_by: ChangeId::ROOT,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2802"}},{"Add":{"text":" };","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2829"}},{"Add":{"text":" match txn.get_graph(channel, &v.last_alive, Some(&edge.into()))? {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:2920"}},{"Add":{"text":" Some(e) if e.dest() == edge.dest && e.flag() == EdgeFlags::BLOCK => {}","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3019"}},{"Add":{"text":" _ => {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3054"}},{"Add":{"text":" put_graph_with_rev(","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3106"}},{"Add":{"text":" txn,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3147"}},{"Add":{"text":" channel,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3192"}},{"Add":{"text":" EdgeFlags::PSEUDO,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3247"}},{"Add":{"text":" v.last_alive,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3297"}},{"Add":{"text":" stack[len - 1].vertex,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3356"}},{"Add":{"text":" ChangeId::ROOT,","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3408"}},{"Add":{"text":" )?;","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3444"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3474"}},{"Add":{"text":" }","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3500"}}],"del_contents":[{"Del":{"text":" stack[len - 1].vertex,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:3065"}},{"Del":{"text":" ChangeId::ROOT,","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:3109"}},{"Del":{"text":" )?;","pos":"H5DIAL52H2LOXEL4JO7YGBYVNZBFOQFQ2UCGFL2KDUEDLCVGQBSQC:3137"}}]}},{"Replacement":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":776,"ins":{"up_context":[{"change":11,"pos":7127}],"down_context":[{"change":11,"pos":7137}],"flag":"BLOCK","start":3502,"end":3547,"inode":{"change":2,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":7127},"to":{"change":11,"start":7127,"end":7137},"introduced_by":11}],"inode":{"change":2,"pos":944089}},"ins_contents":[{"Add":{"text":" if log_enabled!(log::Level::Debug) {","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3546"}}],"del_contents":[{"Del":{"text":" {","pos":"MQ6ERQ43MWASF2OSG65FHKWHCWT35BJVFJWKHAFPVCTLICCTJWUAC:7136"}}]}},{"Edit":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":1125,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":27459}],"down_context":[{"change":4,"pos":27459}],"flag":"BLOCK","start":3548,"end":3611,"inode":{"change":2,"pos":944089}}},"contents":[{"Add":{"text":" debug!(\"put_pseudo {:?} {:?}\", next, current);","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3610"}}]}},{"Replacement":{"inode":{"change":2,"pos":944089},"path":"libpijul/src/apply.rs","line":1250,"ins":{"up_context":[{"change":9,"pos":583}],"down_context":[{"change":9,"pos":639}],"flag":"BLOCK","start":3612,"end":3667,"inode":{"change":2,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":9,"pos":583},"to":{"change":9,"start":583,"end":639},"introduced_by":9}],"inode":{"change":2,"pos":944089}},"ins_contents":[{"Add":{"text":" .sample_iter(rand::distr::StandardUniform)","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3666"}}],"del_contents":[{"Del":{"text":" .sample_iter(rand::distributions::Standard)","pos":"43SISRQ4CLKXN5YVFAGWUU3OJBT2TX6QXWWER33ONLEITSCFCUBAC:638"}}]}},{"Edit":{"inode":{"change":6,"pos":90459},"path":"libpijul/src/apply/vertex.rs","line":37,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":91421}],"down_context":[{"change":10,"pos":2117}],"flag":"BLOCK","start":3668,"end":3911,"inode":{"change":6,"pos":90459}}},"contents":[{"Add":{"text":" // Collect the vertices in the up context (we only have their","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3737"}},{"Add":{"text":" // end positions at this point), also collecting the deleted","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3806"}},{"Add":{"text":" // ones (they're part of a conflict if they're unknown to the","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3876"}},{"Add":{"text":" // patch we're applying).","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3910"}}]}},{"Edit":{"inode":{"change":6,"pos":90459},"path":"libpijul/src/apply/vertex.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":91778}],"down_context":[{"change":6,"pos":91778}],"flag":"BLOCK","start":3912,"end":3979,"inode":{"change":6,"pos":90459}}},"contents":[{"Add":{"text":" // Not the same here, we're only collecting down contexts.","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:3978"}}]}},{"Edit":{"inode":{"change":6,"pos":90459},"path":"libpijul/src/apply/vertex.rs","line":61,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":92181}],"down_context":[{"change":6,"pos":92181}],"flag":"BLOCK","start":3980,"end":4036,"inode":{"change":6,"pos":90459}}},"contents":[{"Add":{"text":" // Mark the delete/insert conflict, if any.","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:4035"}}]}},{"Edit":{"inode":{"change":6,"pos":90459},"path":"libpijul/src/apply/vertex.rs","line":66,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":92333}],"down_context":[{"change":6,"pos":92333}],"flag":"BLOCK","start":4037,"end":4081,"inode":{"change":6,"pos":90459}}},"contents":[{"Add":{"text":" // And put the edge into the graph.","pos":"FSJBK6CUVMSKZVLD7SWC4L53GMPUKIQESWDBFMV5GLX43WBUZDPQC:4080"}}]}}],"owner":"Chasesomero","repo":"pijul","token":"TlHJKt7RS14IHrYtEEfxZSBYcexcwV1A6OXhhumI+2o=","login":null}

…

Dependencies

Change contents

Review