{"header":{"message":"Resurrecting tests, and type cleanup (no need for Arc> anymore)","description":null,"timestamp":"2021-07-10T16:13:31.687085344Z","authors":[{}]},"hash":"FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["AA",null],["S7MAMMFWLEBKCZZ2ZUU743Z2X7XRB2IBB7LPXZVYN37RNPGN4ATAC","Formatting"],["WUBONLD6E3OB5L7SKLIJZKVUUKXEVK7ZZLOHH347H3HV45XH3EUAC","Fixing libpijul::fs::find_path for metadata/encodings"],["3EMLWXLHXMGW2HO4WQLN67S6RN47OJXD5ZXETFLVM22IRX4TXRHQC","Formatting"],["KL5737GRIOFVXKSINVO5DLLWWV4EMHF7ECXMX6ZZLAZZPWDJPB2QC","Text format: correct position of encoding for deletion/undeletion"],["UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","store new non-UTF-8 files raw and decode to deplay the contents"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","Conflict resolution"],["X7OHUPL5VYT6ECER2KNGRNFLRX7SBZOM5QWSQ4PBO2UPIE7XM6MAC","Fixing a bug in unrecord, and fixing the tests"],["4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","File deletions were not shown with their names in the metadata during record"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","detect non-utf8 text files"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["QQZNSB26UHFC4EFFREJX2J7SWAKCB3UAI6OKKIOZ4BLXBK6M54VAC","Permission update (after #X243)"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["AJEH3FSPKLBYSRQQQ4UL4QA3SPT4MHIC4VEM3XDVATMFFU3R7JKAC","Properly propagate errors in `libpijul::record::record` instead of unwrap()ing"],["V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","Channel rename: do not leave the old name behind"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC","Fixing more tests"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","Fixing an index-out-of-bounds error when serialising bad changes"],["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","Do not touch the channel if this is a partial record"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["GDDYJH7AJYJ2DWTYVP6WS3FPPRTDRQAXZ2BH2CKIFGMIASTSLD4QC","fix encoded file add"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["GMGTWOWOPYCGOD3QEQAF5PSQVZWURAIVU6S6URXNHDAGQSC4P3EAC","Fixing a corruption error in channel rename (the channel was being deallocated in Sanakirja, but still referenced by the transaction)"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["5FCWLVFNOACTWLE67XAVLU3QNTFE5XEIGULZ7SBFWWHBHVTNE4XAC","Fixing a conflict with tags"],["3NZS5KNWJU6JIOYVADDFJVJZM5LX5H7EWWKGZ4F2VAIATJCHGNBQC","Making UnrecordError public"],["3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","address non-controversial clippy lints"],["LCXEUK7KIZTFHTMBBDCURKU3CU62YG4NWKEU65UM5HGXMWIBHAHAC","separate line endings test data for dos and unix"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","Fixing a parsing problem (related to permissions), and the associated permissions"],["MOPABMFWZOEMCIQMLEFH74NGTFV6K26FGUFETV3FG5VHCBGLXDIQC","Fixing a deadlock in working_copy::memory (used only in tests for now)"],["5GYRDN47UOT5BSCUID7VLDPI47KILTKGIHKG3AXMDPCTSHKKDB5AC","Error cleanup in libpijul"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["SBSM3VZVFD2A5MD5P3XEUH4LFONYABZCKRNAGIHGTSZOG2QS5SYAC","Fixing a bug in deletions (the encoding was improperly set)"],["YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","Moving to temporary paths when outputting"],["HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","Version updates"],["VSOT2QH5OFG6XX6P7TXZF62IDA2FL7PSEPA2YJCAEFQNJTD5MMLAC","Fixing channel drop (cleanup in other tables + order of reference drop)"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","Do not output unmodified files when resetting (fix)"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["G6YXRFH24OGXYVO4535WCNQMMWOLDH6JYXFDBCL2HQZSOFD25Z5AC","Channel drop with tags"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","Fixing conflicts"],["3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","Re-adding anyhow in the tests of libpijul"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","abstract out FileMetadata (de)serialistion"],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","Formatting"],["FYUDBQ3C5GWIFKITBAKEXTK4AFZXZOH7DHI7QFXQOQ3HYUIYDEVAC","Formatting changes + version bump"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["SGXOEWHUET7RVS5HANSYE7QRQAG56NIKTC56MLPZ5XBCXODEWUXQC","Adding a patched chardetng (temporarily)"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQC","Started fixing the tests for parallel record/output"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","Recursive add"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["WMKGTTVLJBTNGLUKIQAAFTT4ZQB7FWSLN2BWZDRWRWWLBA2OKCZQC","Fixing a compilation error"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","Proper old metadata when recording"],["TZ42DX3BML5C3O5Z6OBVNBCHSIIHT6AOJPD6ICOLOP4LPYFXQN2QC","Properly dropping a channel"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["NGCTMCDPB45UDEXX3RMMQ4JXPILETG7EEFNKMLGP4SJJK52XPLOAC","cleaning up the deps and revdeps of unused changes after a channel drop"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"]],"deps":["S7MAMMFWLEBKCZZ2ZUU743Z2X7XRB2IBB7LPXZVYN37RNPGN4ATAC","WUBONLD6E3OB5L7SKLIJZKVUUKXEVK7ZZLOHH347H3HV45XH3EUAC","3EMLWXLHXMGW2HO4WQLN67S6RN47OJXD5ZXETFLVM22IRX4TXRHQC","KL5737GRIOFVXKSINVO5DLLWWV4EMHF7ECXMX6ZZLAZZPWDJPB2QC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","V2MDXX622MAXHXGLX7ERVKGYZVZDCYJIFET3TGGIK455XIADYJUAC","3YDPHBANMNSK7Z5SCG745VLTP4BBQWIXCJTQOSDI6UJGYR6S45EQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","4OCC6D42GZYRDLH3NSKXMJTRKXP7UZ6Z3YNGCNUT7NT6WBDBCBIAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","GMGTWOWOPYCGOD3QEQAF5PSQVZWURAIVU6S6URXNHDAGQSC4P3EAC","3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","TZ42DX3BML5C3O5Z6OBVNBCHSIIHT6AOJPD6ICOLOP4LPYFXQN2QC","ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","QQZNSB26UHFC4EFFREJX2J7SWAKCB3UAI6OKKIOZ4BLXBK6M54VAC","HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","X7OHUPL5VYT6ECER2KNGRNFLRX7SBZOM5QWSQ4PBO2UPIE7XM6MAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","WMKGTTVLJBTNGLUKIQAAFTT4ZQB7FWSLN2BWZDRWRWWLBA2OKCZQC","YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","NGCTMCDPB45UDEXX3RMMQ4JXPILETG7EEFNKMLGP4SJJK52XPLOAC","VSOT2QH5OFG6XX6P7TXZF62IDA2FL7PSEPA2YJCAEFQNJTD5MMLAC","MOPABMFWZOEMCIQMLEFH74NGTFV6K26FGUFETV3FG5VHCBGLXDIQC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","G6YXRFH24OGXYVO4535WCNQMMWOLDH6JYXFDBCL2HQZSOFD25Z5AC","5FCWLVFNOACTWLE67XAVLU3QNTFE5XEIGULZ7SBFWWHBHVTNE4XAC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","3NZS5KNWJU6JIOYVADDFJVJZM5LX5H7EWWKGZ4F2VAIATJCHGNBQC","5GYRDN47UOT5BSCUID7VLDPI47KILTKGIHKG3AXMDPCTSHKKDB5AC","TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQC","6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","GDDYJH7AJYJ2DWTYVP6WS3FPPRTDRQAXZ2BH2CKIFGMIASTSLD4QC","LCXEUK7KIZTFHTMBBDCURKU3CU62YG4NWKEU65UM5HGXMWIBHAHAC","XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","SBSM3VZVFD2A5MD5P3XEUH4LFONYABZCKRNAGIHGTSZOG2QS5SYAC","FYUDBQ3C5GWIFKITBAKEXTK4AFZXZOH7DHI7QFXQOQ3HYUIYDEVAC","SGXOEWHUET7RVS5HANSYE7QRQAG56NIKTC56MLPZ5XBCXODEWUXQC","LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","AJEH3FSPKLBYSRQQQ4UL4QA3SPT4MHIC4VEM3XDVATMFFU3R7JKAC"]},"hunks":[{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":4,"ins":{"up_context":[{"change":6,"pos":25059}],"down_context":[{"change":6,"pos":199359}],"flag":"BLOCK","start":0,"end":44,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25059},"to":{"change":6,"start":25059,"end":25088},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":"use parking_lot::Mutex;"},{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, Mutex};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":8,"ins":{"up_context":[{"change":6,"pos":199387}],"down_context":[{"change":6,"pos":25124}],"flag":"BLOCK","start":45,"end":109,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":199387},"to":{"change":6,"start":199387,"end":199404},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":199404},"to":{"change":6,"start":25089,"end":25124},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":"#[derive(Debug, Clone)]"},{"Add":"pub struct Memory(Arc>);"}],"del_contents":[{"Del":"#[derive(Debug)]\n"},{"Del":"pub struct Memory(Mutex);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":37,"ins":{"up_context":[{"change":6,"pos":80}],"down_context":[{"change":6,"pos":95}],"flag":"BLOCK","start":110,"end":155,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80},"to":{"change":6,"start":25271,"end":25307},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" Memory(Arc::new(Mutex::new(Memory_ {"}],"del_contents":[{"Del":" Memory(Mutex::new(Memory_ {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":40,"ins":{"up_context":[{"change":6,"pos":200014}],"down_context":[{"change":6,"pos":200024}],"flag":"BLOCK","start":156,"end":169,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":200014},"to":{"change":6,"start":25308,"end":25320},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" })))"}],"del_contents":[{"Del":" }))\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":49,"ins":{"up_context":[{"change":6,"pos":200077}],"down_context":[{"change":6,"pos":200077}],"flag":"BLOCK","start":170,"end":201,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":200077},"to":{"change":6,"start":25321,"end":25361},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock();"}],"del_contents":[{"Del":" let m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":107,"ins":{"up_context":[{"change":6,"pos":25595}],"down_context":[{"change":6,"pos":201978}],"flag":"BLOCK","start":202,"end":237,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25595},"to":{"change":6,"start":25595,"end":25639},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let mut m = self.0.lock();"}],"del_contents":[{"Del":" let mut m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":220,"ins":{"up_context":[{"change":6,"pos":142}],"down_context":[{"change":6,"pos":186}],"flag":"BLOCK","start":238,"end":273,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142},"to":{"change":6,"start":142,"end":186},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock();"}],"del_contents":[{"Del":" let m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":239,"ins":{"up_context":[{"change":6,"pos":2395}],"down_context":[{"change":6,"pos":26088}],"flag":"BLOCK","start":274,"end":305,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2395},"to":{"change":6,"start":26048,"end":26088},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock();"}],"del_contents":[{"Del":" let m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":249,"ins":{"up_context":[{"change":6,"pos":2543}],"down_context":[{"change":6,"pos":26162}],"flag":"BLOCK","start":306,"end":337,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2543},"to":{"change":6,"start":26122,"end":26162},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock();"}],"del_contents":[{"Del":" let m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":253,"ins":{"up_context":[{"change":6,"pos":206603}],"down_context":[{"change":6,"pos":206644}],"flag":"BLOCK","start":338,"end":391,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":206603},"to":{"change":6,"start":26196,"end":26258},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" buffer.extend(&contents.lock()[..]);"}],"del_contents":[{"Del":" buffer.extend(&contents.lock().unwrap()[..]);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":262,"ins":{"up_context":[{"change":6,"pos":2693}],"down_context":[{"change":6,"pos":26299}],"flag":"BLOCK","start":392,"end":423,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2693},"to":{"change":6,"start":26259,"end":26299},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let m = self.0.lock();"}],"del_contents":[{"Del":" let m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":267,"ins":{"up_context":[{"change":6,"pos":26395}],"down_context":[{"change":6,"pos":207113}],"flag":"BLOCK","start":424,"end":466,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26395},"to":{"change":6,"start":26395,"end":26446},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" self.0.lock().remove_path_(path);"}],"del_contents":[{"Del":" self.0.lock().unwrap().remove_path_(path);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":274,"ins":{"up_context":[{"change":6,"pos":291}],"down_context":[{"change":6,"pos":339}],"flag":"BLOCK","start":467,"end":506,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":291},"to":{"change":6,"start":291,"end":339},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let mut m = self.0.lock();"}],"del_contents":[{"Del":" let mut m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":284,"ins":{"up_context":[{"change":6,"pos":207527}],"down_context":[{"change":6,"pos":26750}],"flag":"BLOCK","start":507,"end":542,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":207527},"to":{"change":6,"start":26706,"end":26750},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let mut m = self.0.lock();"}],"del_contents":[{"Del":" let mut m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":299,"ins":{"up_context":[{"change":6,"pos":26891}],"down_context":[{"change":6,"pos":420}],"flag":"BLOCK","start":543,"end":578,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26891},"to":{"change":6,"start":26891,"end":26935},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" let mut m = self.0.lock();"}],"del_contents":[{"Del":" let mut m = self.0.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":305,"ins":{"up_context":[{"change":6,"pos":607}],"down_context":[{"change":6,"pos":531}],"flag":"BLOCK","start":579,"end":620,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":530},"to":{"change":6,"start":26973,"end":27023},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":607},"to":{"change":6,"start":26973,"end":27023},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":208254},"to":{"change":6,"start":26973,"end":27023},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" contents.lock().clear();"}],"del_contents":[{"Del":" contents.lock().unwrap().clear();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":334,"ins":{"up_context":[{"change":6,"pos":27429}],"down_context":[{"change":6,"pos":27469}],"flag":"BLOCK","start":621,"end":652,"inode":{"change":6,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27429},"to":{"change":6,"start":27429,"end":27469},"introduced_by":6}],"inode":{"change":6,"pos":199222}},"ins_contents":[{"Add":" self.w.lock().write(b)"}],"del_contents":[{"Del":" self.w.lock().unwrap().write(b)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":2,"ins":{"up_context":[{"change":6,"pos":208970}],"down_context":[{"change":6,"pos":1191}],"flag":"BLOCK","start":653,"end":699,"inode":{"change":6,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":208970},"to":{"change":6,"start":208970,"end":209006},"introduced_by":6}],"inode":{"change":6,"pos":208900}},"ins_contents":[{"Add":"use crate::pristine::{ArcTxn, InodeMetadata};"}],"del_contents":[{"Del":"use crate::pristine::InodeMetadata;\n"}]}},{"Edit":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":209063},"to":{"change":6,"start":27555,"end":27585},"introduced_by":6}],"inode":{"change":6,"pos":208900}}},"contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Edit":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":209064}],"down_context":[{"change":6,"pos":209064}],"flag":"BLOCK","start":700,"end":717,"inode":{"change":6,"pos":208900}}},"contents":[{"Add":"#[derive(Clone)]"}]}},{"Replacement":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":101,"ins":{"up_context":[{"change":6,"pos":210227}],"down_context":[{"change":6,"pos":27781}],"flag":"BLOCK","start":718,"end":757,"inode":{"change":6,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":210227},"to":{"change":6,"start":27727,"end":27781},"introduced_by":6}],"inode":{"change":6,"pos":208900}},"ins_contents":[{"Add":" &self,"},{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" self: Arc,\n txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":143,"ins":{"up_context":[{"change":6,"pos":1702}],"down_context":[{"change":6,"pos":1756}],"flag":"BLOCK","start":758,"end":782,"inode":{"change":6,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1702},"to":{"change":6,"start":28036,"end":28065},"introduced_by":6}],"inode":{"change":6,"pos":208900}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":210,"ins":{"up_context":[{"change":6,"pos":2858}],"down_context":[{"change":6,"pos":2858}],"flag":"BLOCK","start":783,"end":818,"inode":{"change":6,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2858},"to":{"change":6,"start":28066,"end":28110},"introduced_by":6}],"inode":{"change":6,"pos":208900}},"ins_contents":[{"Add":" let mut txn = txn.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":208900},"path":"libpijul/src/working_copy/filesystem.rs","line":232,"ins":{"up_context":[{"change":6,"pos":211076}],"down_context":[{"change":6,"pos":28306}],"flag":"BLOCK","start":819,"end":858,"inode":{"change":6,"pos":208900}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":211076},"to":{"change":6,"start":28252,"end":28306},"introduced_by":6}],"inode":{"change":6,"pos":208900}},"ins_contents":[{"Add":" &self,"},{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" self: Arc,\n txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":63,"ins":{"up_context":[{"change":6,"pos":22721}],"down_context":[{"change":6,"pos":232194}],"flag":"BLOCK","start":859,"end":898,"inode":{"change":6,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22721},"to":{"change":6,"start":29850,"end":29898},"introduced_by":6}],"inode":{"change":6,"pos":231493}},"ins_contents":[{"Add":" let mut channel = channel.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":121,"ins":{"up_context":[{"change":6,"pos":23536}],"down_context":[{"change":6,"pos":23537}],"flag":"BLOCK","start":899,"end":933,"inode":{"change":6,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":23536},"to":{"change":6,"start":29899,"end":29942},"introduced_by":6}],"inode":{"change":6,"pos":231493}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":127,"ins":{"up_context":[{"change":6,"pos":30054}],"down_context":[{"change":6,"pos":30091}],"flag":"BLOCK","start":934,"end":962,"inode":{"change":6,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30054},"to":{"change":6,"start":30054,"end":30091},"introduced_by":6}],"inode":{"change":6,"pos":231493}},"ins_contents":[{"Add":" let br = br.read();"}],"del_contents":[{"Del":" let br = br.read().unwrap();\n"}]}},{"FileDel":{"deleted_names":[{"basename":"data","metadata":576},{"basename":"data.XSEODPNEN2Y2S","metadata":576},{"basename":"data","metadata":1005}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":248792},"to":{"change":6,"start":10,"end":16},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":16},"to":{"change":6,"start":4375,"end":4375},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":248792},"to":{"change":6,"start":709,"end":729},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":729},"to":{"change":6,"start":4375,"end":4375},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":248792},"to":{"change":6,"start":4368,"end":4374},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4374},"to":{"change":6,"start":4375,"end":4375},"introduced_by":6}],"inode":{"change":6,"pos":4375}}},"content_edges":null,"content":[]}},{"FileDel":{"deleted_names":[{"basename":"1252-dos.1","metadata":0},{"basename":"1252-dos.1","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":84,"end":96},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":96},"to":{"change":6,"start":185,"end":185},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":172,"end":184},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":184},"to":{"change":6,"start":185,"end":185},"introduced_by":6}],"inode":{"change":6,"pos":185}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":185},"to":{"change":6,"start":186,"end":239},"introduced_by":6}],"inode":{"change":6,"pos":185}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"1252-dos.2","metadata":0},{"basename":"1252-dos.2","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":71,"end":83},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":83},"to":{"change":6,"start":117,"end":117},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":104,"end":116},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":116},"to":{"change":6,"start":117,"end":117},"introduced_by":6}],"inode":{"change":6,"pos":117}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":117},"to":{"change":6,"start":118,"end":171},"introduced_by":6}],"inode":{"change":6,"pos":117}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"1252.1","metadata":0},{"basename":"1252.1","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":62,"end":70},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":70},"to":{"change":6,"start":4725,"end":4725},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":4716,"end":4724},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4724},"to":{"change":6,"start":4725,"end":4725},"introduced_by":6}],"inode":{"change":6,"pos":4725}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4725},"to":{"change":6,"start":52,"end":103},"introduced_by":6}],"inode":{"change":6,"pos":4725}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"1252.2","metadata":0},{"basename":"1252.2","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":53,"end":61},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":61},"to":{"change":6,"start":4661,"end":4661},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":4652,"end":4660},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4660},"to":{"change":6,"start":4661,"end":4661},"introduced_by":6}],"inode":{"change":6,"pos":4661}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4661},"to":{"change":6,"start":0,"end":51},"introduced_by":6}],"inode":{"change":6,"pos":4661}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"8859-1.1","metadata":0},{"basename":"8859-1.1","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":42,"end":52},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":52},"to":{"change":6,"start":4590,"end":4590},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":4579,"end":4589},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4589},"to":{"change":6,"start":4590,"end":4590},"introduced_by":6}],"inode":{"change":6,"pos":4590}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4590},"to":{"change":6,"start":4591,"end":4651},"introduced_by":6}],"inode":{"change":6,"pos":4590}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"8859-1.2","metadata":0},{"basename":"8859-1.2","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":31,"end":41},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":41},"to":{"change":6,"start":4517,"end":4517},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":4506,"end":4516},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4516},"to":{"change":6,"start":4517,"end":4517},"introduced_by":6}],"inode":{"change":6,"pos":4517}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4517},"to":{"change":6,"start":4518,"end":4578},"introduced_by":6}],"inode":{"change":6,"pos":4517}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"gb.1","metadata":0},{"basename":"gb.1","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":24,"end":30},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":30},"to":{"change":6,"start":4448,"end":4448},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":4441,"end":4447},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4447},"to":{"change":6,"start":4448,"end":4448},"introduced_by":6}],"inode":{"change":6,"pos":4448}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4448},"to":{"change":6,"start":4449,"end":4505},"introduced_by":6}],"inode":{"change":6,"pos":4448}},"content":[]}},{"FileDel":{"deleted_names":[{"basename":"gb.2","metadata":0},{"basename":"gb.2","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":17,"end":23},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":23},"to":{"change":6,"start":4383,"end":4383},"introduced_by":6},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4375},"to":{"change":6,"start":4376,"end":4382},"introduced_by":6},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":6,"pos":4382},"to":{"change":6,"start":4383,"end":4383},"introduced_by":6}],"inode":{"change":6,"pos":4383}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4383},"to":{"change":6,"start":4384,"end":4440},"introduced_by":6}],"inode":{"change":6,"pos":4383}},"content":[]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":11,"ins":{"up_context":[{"change":6,"pos":249038}],"down_context":[{"change":6,"pos":249094}],"flag":"BLOCK","start":963,"end":1015,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249038},"to":{"change":6,"start":3499,"end":3561},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":17,"ins":{"up_context":[{"change":6,"pos":249265}],"down_context":[{"change":6,"pos":249335}],"flag":"BLOCK","start":1016,"end":1102,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249265},"to":{"change":6,"start":3562,"end":3677},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"dir/file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":20,"ins":{"up_context":[{"change":6,"pos":249336}],"down_context":[{"change":6,"pos":249471}],"flag":"BLOCK","start":1103,"end":1230,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249336},"to":{"change":6,"start":3678,"end":3843},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let _h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let _h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":26,"ins":{"up_context":[{"change":6,"pos":249574}],"down_context":[{"change":6,"pos":249649}],"flag":"BLOCK","start":1231,"end":1294,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249574},"to":{"change":6,"start":3931,"end":4015},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":28,"ins":{"up_context":[{"change":6,"pos":249650}],"down_context":[{"change":6,"pos":249770}],"flag":"BLOCK","start":1295,"end":1432,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249650},"to":{"change":6,"start":4016,"end":4175},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let _channel2 = txn.write().fork(&channel, \"main2\")?;"},{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" let channel2 = (&mut *txn.write().unwrap()).fork(&channel, \"main2\")?;\n crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":31,"ins":{"up_context":[{"change":6,"pos":249828}],"down_context":[{"change":6,"pos":249931}],"flag":"BLOCK","start":1433,"end":1496,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249828},"to":{"change":6,"start":4176,"end":4198},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4198},"to":{"change":6,"start":249847,"end":249865},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249847},"to":{"change":6,"start":249847,"end":249865},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249865},"to":{"change":6,"start":4199,"end":4245},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4245},"to":{"change":6,"start":249905,"end":249931},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249905},"to":{"change":6,"start":249905,"end":249931},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":249931},"to":{"change":6,"start":19324,"end":19338},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":19338},"to":{"change":6,"start":4246,"end":4257},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":40,"ins":{"up_context":[{"change":6,"pos":250161}],"down_context":[{"change":6,"pos":250274}],"flag":"BLOCK","start":1497,"end":1516,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250161},"to":{"change":6,"start":4258,"end":4408},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un\")?;\n debug_to_file(&*txn.read().unwrap(), &channel2, \"debug_un2\")?;\n commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":49,"ins":{"up_context":[{"change":6,"pos":250384}],"down_context":[{"change":6,"pos":250440}],"flag":"BLOCK","start":1517,"end":1569,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250384},"to":{"change":6,"start":4409,"end":4471},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":55,"ins":{"up_context":[{"change":6,"pos":250611}],"down_context":[{"change":6,"pos":250681}],"flag":"BLOCK","start":1570,"end":1656,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250611},"to":{"change":6,"start":4472,"end":4587},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"dir/file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":58,"ins":{"up_context":[{"change":6,"pos":250682}],"down_context":[{"change":6,"pos":250817}],"flag":"BLOCK","start":1657,"end":1784,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250682},"to":{"change":6,"start":4588,"end":4745},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let _h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n let _h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":63,"ins":{"up_context":[{"change":6,"pos":250920}],"down_context":[{"change":6,"pos":250995}],"flag":"BLOCK","start":1785,"end":1848,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250920},"to":{"change":6,"start":4809,"end":4893},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":65,"ins":{"up_context":[{"change":6,"pos":250996}],"down_context":[{"change":6,"pos":251116}],"flag":"BLOCK","start":1849,"end":1986,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":250996},"to":{"change":6,"start":4894,"end":5177},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let _channel2 = txn.write().fork(&channel, \"main2\")?;"},{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" let channel2 = txn.write().unwrap().fork(&channel, \"main2\")?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un0\")?;\n crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":68,"ins":{"up_context":[{"change":6,"pos":251174}],"down_context":[{"change":6,"pos":251277}],"flag":"BLOCK","start":1987,"end":2050,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251174},"to":{"change":6,"start":5178,"end":5200},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5200},"to":{"change":6,"start":251193,"end":251211},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251193},"to":{"change":6,"start":251193,"end":251211},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251211},"to":{"change":6,"start":5201,"end":5247},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5247},"to":{"change":6,"start":251251,"end":251277},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251251},"to":{"change":6,"start":251251,"end":251277},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251277},"to":{"change":6,"start":19457,"end":19471},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":19471},"to":{"change":6,"start":5248,"end":5259},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":77,"ins":{"up_context":[{"change":6,"pos":251507}],"down_context":[{"change":6,"pos":251620}],"flag":"BLOCK","start":2051,"end":2070,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251507},"to":{"change":6,"start":5260,"end":5410},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un\")?;\n debug_to_file(&*txn.read().unwrap(), &channel2, \"debug_un2\")?;\n commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":86,"ins":{"up_context":[{"change":6,"pos":251732}],"down_context":[{"change":6,"pos":251788}],"flag":"BLOCK","start":2071,"end":2123,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251732},"to":{"change":6,"start":5411,"end":5473},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":92,"ins":{"up_context":[{"change":6,"pos":251955}],"down_context":[{"change":6,"pos":252021}],"flag":"BLOCK","start":2124,"end":2206,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":251955},"to":{"change":6,"start":5474,"end":5585},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":95,"ins":{"up_context":[{"change":6,"pos":252022}],"down_context":[{"change":6,"pos":252157}],"flag":"BLOCK","start":2207,"end":2334,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252022},"to":{"change":6,"start":5586,"end":5751},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let _h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let _h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":99,"ins":{"up_context":[{"change":6,"pos":252196}],"down_context":[{"change":6,"pos":252236}],"flag":"BLOCK","start":2335,"end":2386,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252196},"to":{"change":6,"start":5752,"end":5809},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().move_file(\"file\", \"dir/file\", 0)?;"}],"del_contents":[{"Del":" txn.write().unwrap().move_file(\"file\", \"dir/file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":101,"ins":{"up_context":[{"change":6,"pos":252270}],"down_context":[{"change":6,"pos":252345}],"flag":"BLOCK","start":2387,"end":2450,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252270},"to":{"change":6,"start":5810,"end":5894},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":103,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252346},"to":{"change":6,"start":5895,"end":5960},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":104,"ins":{"up_context":[{"change":6,"pos":252428}],"down_context":[{"change":6,"pos":252499}],"flag":"BLOCK","start":2451,"end":2530,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252428},"to":{"change":6,"start":5961,"end":6046},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":106,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252500},"to":{"change":6,"start":6047,"end":6113},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":107,"ins":{"up_context":[{"change":6,"pos":252563}],"down_context":[{"change":6,"pos":27386}],"flag":"BLOCK","start":2531,"end":2595,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252563},"to":{"change":6,"start":6114,"end":6187},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":114,"ins":{"up_context":[{"change":6,"pos":252788}],"down_context":[{"change":6,"pos":252886}],"flag":"BLOCK","start":2596,"end":2694,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252788},"to":{"change":6,"start":2407,"end":2449},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2449},"to":{"change":6,"start":6188,"end":6210},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6210},"to":{"change":6,"start":2468,"end":2486},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2468},"to":{"change":6,"start":2468,"end":2486},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2486},"to":{"change":6,"start":6211,"end":6257},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6257},"to":{"change":6,"start":2526,"end":2566},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2526},"to":{"change":6,"start":2526,"end":2566},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2566},"to":{"change":6,"start":6258,"end":6269},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6269},"to":{"change":6,"start":2566,"end":2574},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2566},"to":{"change":6,"start":2566,"end":2574},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":116,"ins":{"up_context":[{"change":6,"pos":252902}],"down_context":[{"change":6,"pos":27422}],"flag":"BLOCK","start":2695,"end":2759,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":252902},"to":{"change":6,"start":6270,"end":6343},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":128,"ins":{"up_context":[{"change":6,"pos":253105}],"down_context":[{"change":6,"pos":253124}],"flag":"BLOCK","start":2760,"end":2779,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":253105},"to":{"change":6,"start":6344,"end":6362},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":146,"ins":{"up_context":[{"change":6,"pos":253415}],"down_context":[{"change":6,"pos":253585}],"flag":"BLOCK","start":2780,"end":2938,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":253415},"to":{"change":6,"start":6363,"end":6551},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"},{"Add":" let repo2 = working_copy::memory::Memory::new();"},{"Add":" let repo3 = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n let repo2 = Arc::new(working_copy::memory::Memory::new());\n let repo3 = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":156,"ins":{"up_context":[{"change":6,"pos":253870}],"down_context":[{"change":6,"pos":254018}],"flag":"BLOCK","start":2939,"end":3113,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":253870},"to":{"change":6,"start":6552,"end":6801},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"},{"Add":" let txn3 = env3.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let txn2 = Arc::new(RwLock::new(env2.mut_txn_begin().unwrap()));\n let txn3 = Arc::new(RwLock::new(env3.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":161,"ins":{"up_context":[{"change":6,"pos":254019}],"down_context":[{"change":6,"pos":254153}],"flag":"BLOCK","start":3114,"end":3240,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":254019},"to":{"change":6,"start":6802,"end":6966},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":164,"ins":{"up_context":[{"change":6,"pos":254154}],"down_context":[{"change":6,"pos":254276}],"flag":"BLOCK","start":3241,"end":3371,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":254154},"to":{"change":6,"start":6967,"end":7131},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel2 = txn2.write().open_or_create_channel(\"main\")?;"},{"Add":" let channel3 = txn3.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let channel2 = (&mut *txn2.write().unwrap()).open_or_create_channel(\"main\")?;\n let channel3 = (&mut *txn3.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":167,"ins":{"up_context":[{"change":6,"pos":254277}],"down_context":[{"change":6,"pos":254611}],"flag":"BLOCK","start":3372,"end":3700,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":254277},"to":{"change":6,"start":7132,"end":7274},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7274},"to":{"change":6,"start":2575,"end":2617},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":19841},"to":{"change":6,"start":2575,"end":2617},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2617},"to":{"change":6,"start":7275,"end":7298},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7298},"to":{"change":6,"start":2637,"end":2655},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2637},"to":{"change":6,"start":2637,"end":2655},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2655},"to":{"change":6,"start":7299,"end":7347},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7347},"to":{"change":6,"start":2697,"end":2737},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2697},"to":{"change":6,"start":2697,"end":2737},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2737},"to":{"change":6,"start":7348,"end":7359},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7359},"to":{"change":6,"start":2737,"end":2745},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2737},"to":{"change":6,"start":2737,"end":2745},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2745},"to":{"change":6,"start":7360,"end":7502},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7502},"to":{"change":6,"start":2746,"end":2788},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20015},"to":{"change":6,"start":2746,"end":2788},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2788},"to":{"change":6,"start":7503,"end":7526},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7526},"to":{"change":6,"start":2808,"end":2826},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2808},"to":{"change":6,"start":2808,"end":2826},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2826},"to":{"change":6,"start":7527,"end":7575},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7575},"to":{"change":6,"start":2868,"end":2908},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2868},"to":{"change":6,"start":2868,"end":2908},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2908},"to":{"change":6,"start":7576,"end":7587},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7587},"to":{"change":6,"start":2908,"end":2916},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2908},"to":{"change":6,"start":2908,"end":2916},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn2, &channel2, &h0)?;"},{"Add":" output::output_repository_no_pending(&repo2, &changes, &txn2, &channel2, \"\", true, None, 1, 0)?;"},{"Add":" apply::apply_change_arc(&changes, &txn3, &channel3, &h0)?;"},{"Add":" output::output_repository_no_pending(&repo3, &changes, &txn3, &channel3, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn2.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h0,\n )?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo2.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn2.clone(),\n channel2.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"},{"Del":" apply::apply_change(\n &changes,\n &mut *txn3.write().unwrap(),\n &mut *channel3.write().unwrap(),\n &h0,\n )?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo3.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn3.clone(),\n channel3.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":183,"ins":{"up_context":[{"change":6,"pos":255042}],"down_context":[{"change":6,"pos":255115}],"flag":"BLOCK","start":3701,"end":3769,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":255042},"to":{"change":6,"start":7645,"end":7781},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":187,"ins":{"up_context":[{"change":6,"pos":7844}],"down_context":[{"change":6,"pos":255311}],"flag":"BLOCK","start":3770,"end":3836,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7844},"to":{"change":6,"start":7844,"end":7931},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h2 = record_all(&repo2, &changes, &txn2, &channel2, \"\")?;"}],"del_contents":[{"Del":" let h2 = record_all(repo2.clone(), &changes, txn2.clone(), channel2.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":190,"ins":{"up_context":[{"change":6,"pos":7997}],"down_context":[{"change":6,"pos":255494}],"flag":"BLOCK","start":3837,"end":3903,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7997},"to":{"change":6,"start":7997,"end":8084},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h3 = record_all(&repo2, &changes, &txn2, &channel2, \"\")?;"}],"del_contents":[{"Del":" let h3 = record_all(repo2.clone(), &changes, txn2.clone(), channel2.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":193,"ins":{"up_context":[{"change":6,"pos":255511}],"down_context":[{"change":6,"pos":255737}],"flag":"BLOCK","start":3904,"end":4124,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":255511},"to":{"change":6,"start":8085,"end":8365},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":8365},"to":{"change":6,"start":2917,"end":2959},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20253},"to":{"change":6,"start":2917,"end":2959},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2959},"to":{"change":6,"start":8366,"end":8388},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":8388},"to":{"change":6,"start":2978,"end":2996},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2978},"to":{"change":6,"start":2978,"end":2996},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2996},"to":{"change":6,"start":8389,"end":8435},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":8435},"to":{"change":6,"start":3036,"end":3076},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3036},"to":{"change":6,"start":3036,"end":3076},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3076},"to":{"change":6,"start":8436,"end":8447},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":8447},"to":{"change":6,"start":3076,"end":3084},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3076},"to":{"change":6,"start":3076,"end":3084},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h2)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h3)?;"},{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h2,\n )?;\n apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h3,\n )?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":197,"ins":{"up_context":[{"change":6,"pos":255738}],"down_context":[{"change":6,"pos":255856}],"flag":"BLOCK","start":4125,"end":4204,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":255738},"to":{"change":6,"start":8448,"end":8513},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3774},"to":{"change":6,"start":255784,"end":255785},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":8513},"to":{"change":6,"start":255784,"end":255785},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":10613},"to":{"change":6,"start":255784,"end":255785},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":255784},"to":{"change":6,"start":255784,"end":255785},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":255785},"to":{"change":6,"start":8514,"end":8599},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un\")?;\n"},{"Del":"\n"},{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":199,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":255857},"to":{"change":6,"start":8600,"end":8666},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":215,"ins":{"up_context":[{"change":6,"pos":256197}],"down_context":[{"change":6,"pos":256310}],"flag":"BLOCK","start":4205,"end":4310,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":256197},"to":{"change":6,"start":8667,"end":8792},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"},{"Add":" let repo2 = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n let repo2 = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":223,"ins":{"up_context":[{"change":6,"pos":256536}],"down_context":[{"change":6,"pos":256643}],"flag":"BLOCK","start":4311,"end":4439,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":256536},"to":{"change":6,"start":8793,"end":8973},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let txn2 = Arc::new(RwLock::new(env2.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":227,"ins":{"up_context":[{"change":6,"pos":256644}],"down_context":[{"change":6,"pos":256839}],"flag":"BLOCK","start":4440,"end":4631,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":256644},"to":{"change":6,"start":8974,"end":9220},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"},{"Add":" let channel2 = txn2.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n let channel2 = (&mut *txn2.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":231,"ins":{"up_context":[{"change":6,"pos":256840}],"down_context":[{"change":6,"pos":257007}],"flag":"BLOCK","start":4632,"end":4796,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":256840},"to":{"change":6,"start":9221,"end":9363},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":9363},"to":{"change":6,"start":3085,"end":3127},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20425},"to":{"change":6,"start":3085,"end":3127},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3127},"to":{"change":6,"start":9364,"end":9387},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":9387},"to":{"change":6,"start":3147,"end":3165},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3147},"to":{"change":6,"start":3147,"end":3165},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3165},"to":{"change":6,"start":9388,"end":9436},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":9436},"to":{"change":6,"start":3207,"end":3247},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3207},"to":{"change":6,"start":3207,"end":3247},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3247},"to":{"change":6,"start":9437,"end":9448},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":9448},"to":{"change":6,"start":3247,"end":3255},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3247},"to":{"change":6,"start":3247,"end":3255},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn2, &channel2, &h0)?;"},{"Add":" output::output_repository_no_pending(&repo2, &changes, &txn2, &channel2, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn2.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h0,\n )?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo2.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn2.clone(),\n channel2.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":240,"ins":{"up_context":[{"change":6,"pos":257211}],"down_context":[{"change":6,"pos":257338}],"flag":"BLOCK","start":4797,"end":4874,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257211},"to":{"change":6,"start":9501,"end":9710},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug_a\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":245,"ins":{"up_context":[{"change":6,"pos":9773}],"down_context":[{"change":6,"pos":257589}],"flag":"BLOCK","start":4875,"end":4955,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":9773},"to":{"change":6,"start":9773,"end":9987},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h2 = record_all_output(&repo2, changes.clone(), &txn2, &channel2, \"\")?;"}],"del_contents":[{"Del":" let h2 = record_all_output(\n repo2.clone(),\n changes.clone(),\n txn2.clone(),\n channel2.clone(),\n \"\",\n )?;\n debug_to_file(&*txn2.read().unwrap(), &channel2, \"debug_b\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":248,"ins":{"up_context":[{"change":6,"pos":257606}],"down_context":[{"change":6,"pos":257670}],"flag":"BLOCK","start":4956,"end":5017,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257606},"to":{"change":6,"start":9988,"end":10128},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h2,\n )?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":250,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257671},"to":{"change":6,"start":10129,"end":10194},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":251,"ins":{"up_context":[{"change":6,"pos":257744}],"down_context":[{"change":6,"pos":257815}],"flag":"BLOCK","start":5018,"end":5097,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257744},"to":{"change":6,"start":10195,"end":10280},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":253,"ins":{"up_context":[{"change":6,"pos":257873}],"down_context":[{"change":6,"pos":257976}],"flag":"BLOCK","start":5098,"end":5161,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257873},"to":{"change":6,"start":10281,"end":10303},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":10303},"to":{"change":6,"start":257892,"end":257910},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257892},"to":{"change":6,"start":257892,"end":257910},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257910},"to":{"change":6,"start":10304,"end":10350},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":10350},"to":{"change":6,"start":257950,"end":257976},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257950},"to":{"change":6,"start":257950,"end":257976},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257976},"to":{"change":6,"start":20599,"end":20613},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20613},"to":{"change":6,"start":10351,"end":10362},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":255,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":257984},"to":{"change":6,"start":10363,"end":10429},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":272,"ins":{"up_context":[{"change":6,"pos":258535}],"down_context":[{"change":6,"pos":258593}],"flag":"BLOCK","start":5162,"end":5243,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":258535},"to":{"change":6,"start":10430,"end":10529},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let (alive_, reachable_) = check_alive(&*txn.read(), &channel.read().graph);"}],"del_contents":[{"Del":" let (alive_, reachable_) = check_alive(&*txn.read().unwrap(), &channel.read().unwrap().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":280,"ins":{"up_context":[{"change":6,"pos":258752}],"down_context":[{"change":6,"pos":258771}],"flag":"BLOCK","start":5244,"end":5263,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":258752},"to":{"change":6,"start":10530,"end":10548},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":283,"ins":{"up_context":[{"change":6,"pos":258803}],"down_context":[{"change":6,"pos":258918}],"flag":"BLOCK","start":5264,"end":5327,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":258803},"to":{"change":6,"start":10549,"end":10759},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn2, &channel2, &h1)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn2.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h1,\n )?;\n debug_to_file(&*txn2.read().unwrap(), &channel2, \"debug_un3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":286,"ins":{"up_context":[{"change":6,"pos":258960}],"down_context":[{"change":6,"pos":259082}],"flag":"BLOCK","start":5328,"end":5409,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":258960},"to":{"change":6,"start":10760,"end":10915},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn2.write(), &channel2, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn2.write().unwrap(), &channel2, &changes, &h1)?;\n debug_to_file(&*txn2.read().unwrap(), &channel2, \"debug_un4\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":288,"ins":{"up_context":[{"change":6,"pos":259140}],"down_context":[{"change":6,"pos":259244}],"flag":"BLOCK","start":5410,"end":5474,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259140},"to":{"change":6,"start":10916,"end":10938},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":10938},"to":{"change":6,"start":259159,"end":259177},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259159},"to":{"change":6,"start":259159,"end":259177},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259177},"to":{"change":6,"start":10939,"end":10986},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":10986},"to":{"change":6,"start":259218,"end":259244},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259218},"to":{"change":6,"start":259218,"end":259244},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259244},"to":{"change":6,"start":20682,"end":20696},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20696},"to":{"change":6,"start":10987,"end":10998},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn2, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn2.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":302,"ins":{"up_context":[{"change":6,"pos":259535}],"down_context":[{"change":6,"pos":259591}],"flag":"BLOCK","start":5475,"end":5527,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259535},"to":{"change":6,"start":10999,"end":11061},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":307,"ins":{"up_context":[{"change":6,"pos":259760}],"down_context":[{"change":6,"pos":259829}],"flag":"BLOCK","start":5528,"end":5613,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259760},"to":{"change":6,"start":11062,"end":11176},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"a/b/c/d\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"a/b/c/d\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":310,"ins":{"up_context":[{"change":6,"pos":259830}],"down_context":[{"change":6,"pos":259955}],"flag":"BLOCK","start":5614,"end":5731,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259830},"to":{"change":6,"start":11177,"end":11332},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":314,"ins":{"up_context":[{"change":6,"pos":259990}],"down_context":[{"change":6,"pos":260072}],"flag":"BLOCK","start":5732,"end":5809,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":259990},"to":{"change":6,"start":11333,"end":11478},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":317,"ins":{"up_context":[{"change":6,"pos":260103}],"down_context":[{"change":6,"pos":260284}],"flag":"BLOCK","start":5810,"end":5986,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260103},"to":{"change":6,"start":11479,"end":11625},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11625},"to":{"change":6,"start":3256,"end":3298},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260186},"to":{"change":6,"start":3256,"end":3298},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3298},"to":{"change":6,"start":11626,"end":11648},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11648},"to":{"change":6,"start":3317,"end":3335},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3317},"to":{"change":6,"start":3317,"end":3335},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3335},"to":{"change":6,"start":11649,"end":11695},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11695},"to":{"change":6,"start":3375,"end":3415},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3375},"to":{"change":6,"start":3375,"end":3415},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3415},"to":{"change":6,"start":11696,"end":11707},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11707},"to":{"change":6,"start":3415,"end":3423},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3415},"to":{"change":6,"start":3415,"end":3423},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let _h2 = record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"},{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" let _h2 = record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":323,"ins":{"up_context":[{"change":6,"pos":260384}],"down_context":[{"change":6,"pos":260549}],"flag":"BLOCK","start":5987,"end":6066,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260384},"to":{"change":6,"start":11708,"end":11858},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11858},"to":{"change":6,"start":260501,"end":260502},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260501},"to":{"change":6,"start":260501,"end":260502},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260502},"to":{"change":6,"start":11859,"end":11925},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un\")?;\n crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;\n"},{"Del":"\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug_un2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":326,"ins":{"up_context":[{"change":6,"pos":260608}],"down_context":[{"change":6,"pos":260711}],"flag":"BLOCK","start":6067,"end":6130,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260608},"to":{"change":6,"start":11926,"end":11948},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11948},"to":{"change":6,"start":260627,"end":260645},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260627},"to":{"change":6,"start":260627,"end":260645},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260645},"to":{"change":6,"start":11949,"end":11995},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":11995},"to":{"change":6,"start":260685,"end":260711},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260685},"to":{"change":6,"start":260685,"end":260711},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":260711},"to":{"change":6,"start":20802,"end":20816},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":20816},"to":{"change":6,"start":11996,"end":12007},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":342,"ins":{"up_context":[{"change":6,"pos":261132}],"down_context":[{"change":6,"pos":261190}],"flag":"BLOCK","start":6131,"end":6212,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":261132},"to":{"change":6,"start":12008,"end":12107},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let (alive_, reachable_) = check_alive(&*txn.read(), &channel.read().graph);"}],"del_contents":[{"Del":" let (alive_, reachable_) = check_alive(&*txn.read().unwrap(), &channel.read().unwrap().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":350,"ins":{"up_context":[{"change":6,"pos":261349}],"down_context":[{"change":6,"pos":261368}],"flag":"BLOCK","start":6213,"end":6232,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":261349},"to":{"change":6,"start":12108,"end":12126},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":359,"ins":{"up_context":[{"change":6,"pos":261476}],"down_context":[{"change":6,"pos":261532}],"flag":"BLOCK","start":6233,"end":6285,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":261476},"to":{"change":6,"start":12127,"end":12189},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":365,"ins":{"up_context":[{"change":6,"pos":261703}],"down_context":[{"change":6,"pos":261797}],"flag":"BLOCK","start":6286,"end":6404,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":261703},"to":{"change":6,"start":12190,"end":12346},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0)?;"},{"Add":" debug_inodes(&*txn.read());"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n txn.write().unwrap().add_file(\"dir/file\")?;\n debug_inodes(&*txn.read().unwrap());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":369,"ins":{"up_context":[{"change":6,"pos":261798}],"down_context":[{"change":6,"pos":261932}],"flag":"BLOCK","start":6405,"end":6531,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":261798},"to":{"change":6,"start":12347,"end":12511},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":374,"ins":{"up_context":[{"change":6,"pos":262035}],"down_context":[{"change":6,"pos":262134}],"flag":"BLOCK","start":6532,"end":6627,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":262035},"to":{"change":6,"start":12575,"end":12700},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"},{"Add":" debug_inodes(&*txn.read());"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n debug_inodes(&*txn.read().unwrap());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":377,"ins":{"up_context":[{"change":6,"pos":262135}],"down_context":[{"change":6,"pos":495}],"flag":"BLOCK","start":6628,"end":6713,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":262135},"to":{"change":6,"start":12701,"end":12792},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" match crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0) {"}],"del_contents":[{"Del":" match crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h0) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":382,"ins":{"up_context":[{"change":6,"pos":262468}],"down_context":[{"change":6,"pos":575}],"flag":"BLOCK","start":6714,"end":6897,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":262468},"to":{"change":6,"start":12793,"end":13008},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" debug_inodes(&*txn.read());"},{"Add":" let channel2 = txn.write().open_or_create_channel(\"main2\")?;"},{"Add":" match crate::unrecord::unrecord(&mut *txn.write(), &channel2, &changes, &h0, 0) {"}],"del_contents":[{"Del":" debug_inodes(&*txn.read().unwrap());\n let channel2 = (&mut *txn.write().unwrap()).open_or_create_channel(\"main2\")?;\n match crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel2, &changes, &h0) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":389,"ins":{"up_context":[{"change":6,"pos":262885}],"down_context":[{"change":6,"pos":262930}],"flag":"BLOCK","start":6898,"end":6958,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":262885},"to":{"change":6,"start":13009,"end":13127},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" for p in txn.read().log(&*channel.read(), 0).unwrap() {"}],"del_contents":[{"Del":" for p in txn\n .read()\n .unwrap()\n .log(&*channel.read().unwrap(), 0)\n .unwrap()\n {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":393,"ins":{"up_context":[{"change":6,"pos":262968}],"down_context":[{"change":6,"pos":263106}],"flag":"BLOCK","start":6959,"end":7070,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":262968},"to":{"change":6,"start":13128,"end":13316},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" debug_inodes(&*txn.read());"},{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" debug_inodes(&*txn.read().unwrap());\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug\")?;\n crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":396,"ins":{"up_context":[{"change":6,"pos":263107}],"down_context":[{"change":6,"pos":263152}],"flag":"BLOCK","start":7071,"end":7131,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":263107},"to":{"change":6,"start":13317,"end":13435},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" for p in txn.read().log(&*channel.read(), 0).unwrap() {"}],"del_contents":[{"Del":" for p in txn\n .read()\n .unwrap()\n .log(&*channel.read().unwrap(), 0)\n .unwrap()\n {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":400,"ins":{"up_context":[{"change":6,"pos":263190}],"down_context":[{"change":6,"pos":263373}],"flag":"BLOCK","start":7132,"end":7243,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":263190},"to":{"change":6,"start":13436,"end":13688},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" debug_inodes(&*txn.read());"},{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0)?;"}],"del_contents":[{"Del":" debug_inodes(&*txn.read().unwrap());\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\")?;\n crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h0)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":403,"ins":{"up_context":[{"change":6,"pos":263374}],"down_context":[{"change":6,"pos":20921}],"flag":"BLOCK","start":7244,"end":7342,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":263374},"to":{"change":6,"start":3424,"end":3466},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3466},"to":{"change":6,"start":13689,"end":13711},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":13711},"to":{"change":6,"start":3485,"end":3503},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3485},"to":{"change":6,"start":3485,"end":3503},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3503},"to":{"change":6,"start":13712,"end":13758},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":13758},"to":{"change":6,"start":3543,"end":3583},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3543},"to":{"change":6,"start":3543,"end":3583},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3583},"to":{"change":6,"start":13759,"end":13770},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":13770},"to":{"change":6,"start":3583,"end":3591},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3583},"to":{"change":6,"start":3583,"end":3591},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":410,"ins":{"up_context":[{"change":6,"pos":21138}],"down_context":[{"change":6,"pos":263709}],"flag":"BLOCK","start":7343,"end":7467,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21138},"to":{"change":6,"start":13771,"end":13925},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" assert!(crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"},{"Add":" .next()"},{"Add":" .is_none());"},{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" assert!(\n crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n .next()\n .is_none()\n );\n commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":422,"ins":{"up_context":[{"change":6,"pos":263820}],"down_context":[{"change":6,"pos":263876}],"flag":"BLOCK","start":7468,"end":7520,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":263820},"to":{"change":6,"start":13926,"end":13988},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":427,"ins":{"up_context":[{"change":6,"pos":263990}],"down_context":[{"change":6,"pos":264029}],"flag":"BLOCK","start":7521,"end":7565,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":263990},"to":{"change":6,"start":13989,"end":14056},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":429,"ins":{"up_context":[{"change":6,"pos":264030}],"down_context":[{"change":6,"pos":264089}],"flag":"BLOCK","start":7566,"end":7629,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264030},"to":{"change":6,"start":14057,"end":14137},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":432,"ins":{"up_context":[{"change":6,"pos":264137}],"down_context":[{"change":6,"pos":264239}],"flag":"BLOCK","start":7630,"end":7731,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264137},"to":{"change":6,"start":14138,"end":14266},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":436,"ins":{"up_context":[{"change":6,"pos":264271}],"down_context":[{"change":6,"pos":264345}],"flag":"BLOCK","start":7732,"end":7794,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264271},"to":{"change":6,"start":14267,"end":14350},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":438,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264346},"to":{"change":6,"start":14351,"end":14413},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":440,"ins":{"up_context":[{"change":6,"pos":264448}],"down_context":[{"change":6,"pos":264562}],"flag":"BLOCK","start":7795,"end":7873,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264448},"to":{"change":6,"start":14414,"end":14561},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":442,"ins":{"up_context":[{"change":6,"pos":264620}],"down_context":[{"change":6,"pos":264723}],"flag":"BLOCK","start":7874,"end":7937,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264620},"to":{"change":6,"start":14562,"end":14584},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":14584},"to":{"change":6,"start":264639,"end":264657},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264639},"to":{"change":6,"start":264639,"end":264657},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264657},"to":{"change":6,"start":14585,"end":14631},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":14631},"to":{"change":6,"start":264697,"end":264723},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264697},"to":{"change":6,"start":264697,"end":264723},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264723},"to":{"change":6,"start":21139,"end":21153},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21153},"to":{"change":6,"start":14632,"end":14643},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":451,"ins":{"up_context":[{"change":6,"pos":264932}],"down_context":[{"change":6,"pos":265047}],"flag":"BLOCK","start":7938,"end":8017,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":264932},"to":{"change":6,"start":14644,"end":14792},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h0)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":453,"ins":{"up_context":[{"change":6,"pos":265105}],"down_context":[{"change":6,"pos":265208}],"flag":"BLOCK","start":8018,"end":8081,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265105},"to":{"change":6,"start":14793,"end":14815},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":14815},"to":{"change":6,"start":265124,"end":265142},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265124},"to":{"change":6,"start":265124,"end":265142},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265142},"to":{"change":6,"start":14816,"end":14862},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":14862},"to":{"change":6,"start":265182,"end":265208},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265182},"to":{"change":6,"start":265182,"end":265208},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265208},"to":{"change":6,"start":21154,"end":21168},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21168},"to":{"change":6,"start":14863,"end":14874},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":461,"ins":{"up_context":[{"change":6,"pos":21265}],"down_context":[{"change":6,"pos":265443}],"flag":"BLOCK","start":8082,"end":8101,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21265},"to":{"change":6,"start":14875,"end":14893},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":470,"ins":{"up_context":[{"change":6,"pos":265628}],"down_context":[{"change":6,"pos":265684}],"flag":"BLOCK","start":8102,"end":8154,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265628},"to":{"change":6,"start":14894,"end":14956},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":475,"ins":{"up_context":[{"change":6,"pos":265798}],"down_context":[{"change":6,"pos":265837}],"flag":"BLOCK","start":8155,"end":8199,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265798},"to":{"change":6,"start":14957,"end":15024},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":477,"ins":{"up_context":[{"change":6,"pos":265838}],"down_context":[{"change":6,"pos":265897}],"flag":"BLOCK","start":8200,"end":8267,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265838},"to":{"change":6,"start":15025,"end":15109},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let mut channel = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":480,"ins":{"up_context":[{"change":6,"pos":265945}],"down_context":[{"change":6,"pos":266038}],"flag":"BLOCK","start":8268,"end":8360,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":265945},"to":{"change":6,"start":15110,"end":15229},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\")?;\n record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":483,"ins":{"up_context":[{"change":6,"pos":266039}],"down_context":[{"change":6,"pos":266092}],"flag":"BLOCK","start":8361,"end":8418,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266039},"to":{"change":6,"start":15230,"end":15304},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel2 = txn.write().fork(&channel, \"main2\")?;"}],"del_contents":[{"Del":" let channel2 = (&mut *txn.write().unwrap()).fork(&channel, \"main2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":486,"ins":{"up_context":[{"change":6,"pos":15360}],"down_context":[{"change":6,"pos":15435}],"flag":"BLOCK","start":8419,"end":8473,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":15360},"to":{"change":6,"start":15360,"end":15435},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":488,"ins":{"up_context":[{"change":6,"pos":15490}],"down_context":[{"change":6,"pos":266366}],"flag":"BLOCK","start":8474,"end":8537,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":15490},"to":{"change":6,"start":15490,"end":15574},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let b = record_all(&repo, &changes, &txn, &channel2, \"\")?;"}],"del_contents":[{"Del":" let b = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":490,"ins":{"up_context":[{"change":6,"pos":266367}],"down_context":[{"change":6,"pos":266473}],"flag":"BLOCK","start":8538,"end":8598,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266367},"to":{"change":6,"start":15575,"end":15776},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &b)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &b,\n )?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":492,"ins":{"up_context":[{"change":6,"pos":266531}],"down_context":[{"change":6,"pos":266634}],"flag":"BLOCK","start":8599,"end":8662,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266531},"to":{"change":6,"start":15777,"end":15799},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":15799},"to":{"change":6,"start":266550,"end":266568},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266550},"to":{"change":6,"start":266550,"end":266568},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266568},"to":{"change":6,"start":15800,"end":15846},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":15846},"to":{"change":6,"start":266608,"end":266634},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266608},"to":{"change":6,"start":266608,"end":266634},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":266634},"to":{"change":6,"start":21331,"end":21345},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21345},"to":{"change":6,"start":15847,"end":15858},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":517,"ins":{"up_context":[{"change":6,"pos":16041}],"down_context":[{"change":6,"pos":267353}],"flag":"BLOCK","start":8663,"end":8725,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":16041},"to":{"change":6,"start":16041,"end":16187},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let c = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let c = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":519,"ins":{"up_context":[{"change":6,"pos":267354}],"down_context":[{"change":6,"pos":267468}],"flag":"BLOCK","start":8726,"end":8808,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":267354},"to":{"change":6,"start":16188,"end":16339},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &mut channel, &changes, &c, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &mut channel, &changes, &c)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":522,"ins":{"up_context":[{"change":6,"pos":267527}],"down_context":[{"change":6,"pos":267630}],"flag":"BLOCK","start":8809,"end":8872,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":267527},"to":{"change":6,"start":16340,"end":16362},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16362},"to":{"change":6,"start":267546,"end":267564},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":267546},"to":{"change":6,"start":267546,"end":267564},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":267564},"to":{"change":6,"start":16363,"end":16409},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16409},"to":{"change":6,"start":267604,"end":267630},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":267604},"to":{"change":6,"start":267604,"end":267630},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":267630},"to":{"change":6,"start":21346,"end":21360},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21360},"to":{"change":6,"start":16410,"end":16421},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":547,"ins":{"up_context":[{"change":6,"pos":268270}],"down_context":[{"change":6,"pos":268289}],"flag":"BLOCK","start":8873,"end":8892,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":268270},"to":{"change":6,"start":16422,"end":16440},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":565,"ins":{"up_context":[{"change":6,"pos":268574}],"down_context":[{"change":6,"pos":268630}],"flag":"BLOCK","start":8893,"end":8945,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":268574},"to":{"change":6,"start":16441,"end":16503},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":570,"ins":{"up_context":[{"change":6,"pos":268744}],"down_context":[{"change":6,"pos":268783}],"flag":"BLOCK","start":8946,"end":8990,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":268744},"to":{"change":6,"start":16504,"end":16571},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":572,"ins":{"up_context":[{"change":6,"pos":268784}],"down_context":[{"change":6,"pos":268843}],"flag":"BLOCK","start":8991,"end":9054,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":268784},"to":{"change":6,"start":16572,"end":16652},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":576,"ins":{"up_context":[{"change":6,"pos":268913}],"down_context":[{"change":6,"pos":269006}],"flag":"BLOCK","start":9055,"end":9147,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":268913},"to":{"change":6,"start":16653,"end":16772},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\")?;\n record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":585,"ins":{"up_context":[{"change":6,"pos":269206}],"down_context":[{"change":6,"pos":269284}],"flag":"BLOCK","start":9148,"end":9214,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269206},"to":{"change":6,"start":16830,"end":16917},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h_del = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h_del = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":601,"ins":{"up_context":[{"change":6,"pos":269719}],"down_context":[{"change":6,"pos":269786}],"flag":"BLOCK","start":9215,"end":9279,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269719},"to":{"change":6,"start":16918,"end":17061},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h_inv)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h_inv,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":603,"ins":{"up_context":[{"change":6,"pos":269844}],"down_context":[{"change":6,"pos":269947}],"flag":"BLOCK","start":9280,"end":9343,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269844},"to":{"change":6,"start":17062,"end":17084},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":17084},"to":{"change":6,"start":269863,"end":269881},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269863},"to":{"change":6,"start":269863,"end":269881},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269881},"to":{"change":6,"start":17085,"end":17131},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":17131},"to":{"change":6,"start":269921,"end":269947},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269921},"to":{"change":6,"start":269921,"end":269947},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269947},"to":{"change":6,"start":21430,"end":21444},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21444},"to":{"change":6,"start":17132,"end":17143},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":605,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269955},"to":{"change":6,"start":17144,"end":17206},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":613,"ins":{"up_context":[{"change":6,"pos":270241}],"down_context":[{"change":6,"pos":270315}],"flag":"BLOCK","start":9344,"end":9426,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270241},"to":{"change":6,"start":17207,"end":17295},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h_inv, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h_inv)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":615,"ins":{"up_context":[{"change":6,"pos":270373}],"down_context":[{"change":6,"pos":270476}],"flag":"BLOCK","start":9427,"end":9490,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270373},"to":{"change":6,"start":17296,"end":17318},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":17318},"to":{"change":6,"start":270392,"end":270410},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270392},"to":{"change":6,"start":270392,"end":270410},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270410},"to":{"change":6,"start":17319,"end":17365},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":17365},"to":{"change":6,"start":270450,"end":270476},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270450},"to":{"change":6,"start":270450,"end":270476},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270476},"to":{"change":6,"start":21445,"end":21459},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21459},"to":{"change":6,"start":17366,"end":17377},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":617,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270484},"to":{"change":6,"start":17378,"end":17441},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":628,"ins":{"up_context":[{"change":6,"pos":270818}],"down_context":[{"change":6,"pos":270837}],"flag":"BLOCK","start":9491,"end":9510,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":270818},"to":{"change":6,"start":17442,"end":17460},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":639,"ins":{"up_context":[{"change":6,"pos":271084}],"down_context":[{"change":6,"pos":271140}],"flag":"BLOCK","start":9511,"end":9563,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271084},"to":{"change":6,"start":17461,"end":17523},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":643,"ins":{"up_context":[{"change":6,"pos":271253}],"down_context":[{"change":6,"pos":271412}],"flag":"BLOCK","start":9564,"end":9736,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271253},"to":{"change":6,"start":17524,"end":17753},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let channel2 = txn.write().open_or_create_channel(\"main2\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let channel2 = (&mut *txn.write().unwrap()).open_or_create_channel(\"main2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":648,"ins":{"up_context":[{"change":6,"pos":271478}],"down_context":[{"change":6,"pos":271580}],"flag":"BLOCK","start":9737,"end":9838,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271478},"to":{"change":6,"start":17754,"end":17882},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":652,"ins":{"up_context":[{"change":6,"pos":271610}],"down_context":[{"change":6,"pos":271675}],"flag":"BLOCK","start":9839,"end":9901,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271610},"to":{"change":6,"start":17883,"end":18024},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel2, &h0)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h0,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":659,"ins":{"up_context":[{"change":6,"pos":18084}],"down_context":[{"change":6,"pos":271871}],"flag":"BLOCK","start":9902,"end":9965,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":18084},"to":{"change":6,"start":18084,"end":18168},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":661,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271900},"to":{"change":6,"start":271900,"end":271901},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271901},"to":{"change":6,"start":18169,"end":18232},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":"\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":663,"ins":{"up_context":[{"change":6,"pos":271969}],"down_context":[{"change":6,"pos":272135}],"flag":"BLOCK","start":9966,"end":10030,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":271969},"to":{"change":6,"start":18233,"end":18318},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h2 = record_all(&repo, &changes, &txn, &channel2, \"\")?;"}],"del_contents":[{"Del":" let h2 = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":668,"ins":{"up_context":[{"change":6,"pos":272221}],"down_context":[{"change":6,"pos":272285}],"flag":"BLOCK","start":10031,"end":10092,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272221},"to":{"change":6,"start":18319,"end":18459},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h2,\n )?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":670,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272286},"to":{"change":6,"start":18460,"end":18589},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug1a\")?;\n debug_to_file(&*txn.read().unwrap(), &channel2, \"debug1b\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":671,"ins":{"up_context":[{"change":6,"pos":272403}],"down_context":[{"change":6,"pos":272518}],"flag":"BLOCK","start":10093,"end":10172,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272403},"to":{"change":6,"start":18590,"end":18738},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":674,"ins":{"up_context":[{"change":6,"pos":272577}],"down_context":[{"change":6,"pos":272680}],"flag":"BLOCK","start":10173,"end":10236,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272577},"to":{"change":6,"start":18739,"end":18761},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":18761},"to":{"change":6,"start":272596,"end":272614},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272596},"to":{"change":6,"start":272596,"end":272614},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272614},"to":{"change":6,"start":18762,"end":18808},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":18808},"to":{"change":6,"start":272654,"end":272680},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272654},"to":{"change":6,"start":272654,"end":272680},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272680},"to":{"change":6,"start":21706,"end":21720},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21720},"to":{"change":6,"start":18809,"end":18820},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":680,"ins":{"up_context":[{"change":6,"pos":272774}],"down_context":[{"change":6,"pos":272793}],"flag":"BLOCK","start":10237,"end":10256,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":272774},"to":{"change":6,"start":18821,"end":18839},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":691,"ins":{"up_context":[{"change":6,"pos":273052}],"down_context":[{"change":6,"pos":273108}],"flag":"BLOCK","start":10257,"end":10309,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":273052},"to":{"change":6,"start":18840,"end":18902},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":695,"ins":{"up_context":[{"change":6,"pos":273221}],"down_context":[{"change":6,"pos":273380}],"flag":"BLOCK","start":10310,"end":10490,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":273221},"to":{"change":6,"start":18903,"end":19140},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let mut channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let mut channel2 = txn.write().open_or_create_channel(\"main2\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let mut channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let mut channel2 = (&mut *txn.write().unwrap()).open_or_create_channel(\"main2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":700,"ins":{"up_context":[{"change":6,"pos":273446}],"down_context":[{"change":6,"pos":273548}],"flag":"BLOCK","start":10491,"end":10592,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":273446},"to":{"change":6,"start":19141,"end":19269},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":704,"ins":{"up_context":[{"change":6,"pos":273578}],"down_context":[{"change":6,"pos":273643}],"flag":"BLOCK","start":10593,"end":10655,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":273578},"to":{"change":6,"start":19270,"end":19411},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel2, &h0)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h0,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":711,"ins":{"up_context":[{"change":6,"pos":19471}],"down_context":[{"change":6,"pos":273839}],"flag":"BLOCK","start":10656,"end":10719,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":19471},"to":{"change":6,"start":19471,"end":19555},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":714,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":273869},"to":{"change":6,"start":19556,"end":19619},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5199},"to":{"change":6,"start":273913,"end":273914},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":12058},"to":{"change":6,"start":273913,"end":273914},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":19619},"to":{"change":6,"start":273913,"end":273914},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":273913},"to":{"change":6,"start":273913,"end":273914},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\")?;\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":719,"ins":{"up_context":[{"change":6,"pos":19679}],"down_context":[{"change":6,"pos":274103}],"flag":"BLOCK","start":10720,"end":10784,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":19679},"to":{"change":6,"start":19679,"end":19764},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h2 = record_all(&repo, &changes, &txn, &channel2, \"\")?;"}],"del_contents":[{"Del":" let h2 = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":724,"ins":{"up_context":[{"change":6,"pos":274217}],"down_context":[{"change":6,"pos":274281}],"flag":"BLOCK","start":10785,"end":10846,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274217},"to":{"change":6,"start":19765,"end":19905},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h2,\n )?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":726,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274282},"to":{"change":6,"start":19906,"end":20035},"introduced_by":6}],"inode":{"change":6,"pos":248807}}},"contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug1a\")?;\n debug_to_file(&*txn.read().unwrap(), &channel2, \"debug1b\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":727,"ins":{"up_context":[{"change":6,"pos":274399}],"down_context":[{"change":6,"pos":274514}],"flag":"BLOCK","start":10847,"end":10930,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274399},"to":{"change":6,"start":20036,"end":20188},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &mut channel, &changes, &h2, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &mut channel, &changes, &h2)?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":730,"ins":{"up_context":[{"change":6,"pos":274573}],"down_context":[{"change":6,"pos":274676}],"flag":"BLOCK","start":10931,"end":10994,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274573},"to":{"change":6,"start":20189,"end":20211},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20211},"to":{"change":6,"start":274592,"end":274610},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274592},"to":{"change":6,"start":274592,"end":274610},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274610},"to":{"change":6,"start":20212,"end":20258},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20258},"to":{"change":6,"start":274650,"end":274676},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274650},"to":{"change":6,"start":274650,"end":274676},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274676},"to":{"change":6,"start":21854,"end":21868},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":21868},"to":{"change":6,"start":20259,"end":20270},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":738,"ins":{"up_context":[{"change":6,"pos":274878}],"down_context":[{"change":6,"pos":274943}],"flag":"BLOCK","start":10995,"end":11057,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":274878},"to":{"change":6,"start":20271,"end":20412},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel2, &h1)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h1,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":755,"ins":{"up_context":[{"change":6,"pos":275419}],"down_context":[{"change":6,"pos":275439}],"flag":"BLOCK","start":11058,"end":11079,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275419},"to":{"change":6,"start":275419,"end":275439},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" for _i in 0..6 {"}],"del_contents":[{"Del":" for i in 0..6 {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":757,"ins":{"up_context":[{"change":6,"pos":275468}],"down_context":[{"change":6,"pos":275607}],"flag":"BLOCK","start":11080,"end":11153,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275468},"to":{"change":6,"start":20413,"end":20676},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel2, &r).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &r,\n )\n .unwrap();\n debug_to_file(&*txn.read().unwrap(), &channel2, format!(\"debug_{}\", i))?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":760,"ins":{"up_context":[{"change":6,"pos":275627}],"down_context":[{"change":6,"pos":275749}],"flag":"BLOCK","start":11154,"end":11238,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275627},"to":{"change":6,"start":20677,"end":20836},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &mut channel2, &changes, &h1, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &mut channel2, &changes, &h1)?;\n debug_to_file(&*txn.read().unwrap(), &channel2, \"debug_final\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":763,"ins":{"up_context":[{"change":6,"pos":275808}],"down_context":[{"change":6,"pos":275911}],"flag":"BLOCK","start":11239,"end":11302,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275808},"to":{"change":6,"start":20837,"end":20859},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20859},"to":{"change":6,"start":275827,"end":275845},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275827},"to":{"change":6,"start":275827,"end":275845},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275845},"to":{"change":6,"start":20860,"end":20906},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20906},"to":{"change":6,"start":275885,"end":275911},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275885},"to":{"change":6,"start":275885,"end":275911},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":275911},"to":{"change":6,"start":22014,"end":22028},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22028},"to":{"change":6,"start":20907,"end":20918},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" &repo, &changes, &txn, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":769,"ins":{"up_context":[{"change":6,"pos":276004}],"down_context":[{"change":6,"pos":367}],"flag":"BLOCK","start":11303,"end":11322,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":276004},"to":{"change":6,"start":20919,"end":20937},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.commit()?;"}],"del_contents":[{"Del":" commit(txn)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":779,"ins":{"up_context":[{"change":6,"pos":612}],"down_context":[{"change":6,"pos":668}],"flag":"BLOCK","start":11323,"end":11375,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":612},"to":{"change":6,"start":20938,"end":21000},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":783,"ins":{"up_context":[{"change":6,"pos":781}],"down_context":[{"change":6,"pos":940}],"flag":"BLOCK","start":11376,"end":11548,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":781},"to":{"change":6,"start":21001,"end":21230},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" let channel2 = txn.write().open_or_create_channel(\"main2\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n let channel2 = (&mut *txn.write().unwrap()).open_or_create_channel(\"main2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":788,"ins":{"up_context":[{"change":6,"pos":1006}],"down_context":[{"change":6,"pos":1108}],"flag":"BLOCK","start":11549,"end":11650,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1006},"to":{"change":6,"start":21231,"end":21359},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let h0 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\")?;\n let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":792,"ins":{"up_context":[{"change":6,"pos":1138}],"down_context":[{"change":6,"pos":276023}],"flag":"BLOCK","start":11651,"end":11713,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1138},"to":{"change":6,"start":21360,"end":21501},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel2, &h0)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel2.write().unwrap(),\n &h0,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":796,"ins":{"up_context":[{"change":6,"pos":1257}],"down_context":[{"change":6,"pos":1332}],"flag":"BLOCK","start":11714,"end":11777,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1257},"to":{"change":6,"start":21502,"end":21586},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h1 = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":799,"ins":{"up_context":[{"change":6,"pos":1384}],"down_context":[{"change":6,"pos":1460}],"flag":"BLOCK","start":11778,"end":11842,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1384},"to":{"change":6,"start":21587,"end":21672},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let h2 = record_all(&repo, &changes, &txn, &channel2, \"\")?;"}],"del_contents":[{"Del":" let h2 = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":804,"ins":{"up_context":[{"change":6,"pos":1546}],"down_context":[{"change":6,"pos":1610}],"flag":"BLOCK","start":11843,"end":11904,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1546},"to":{"change":6,"start":21673,"end":21813},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &h2)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut *txn.write().unwrap(),\n &mut *channel.write().unwrap(),\n &h2,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":806,"ins":{"up_context":[{"change":6,"pos":1611}],"down_context":[{"change":6,"pos":1753}],"flag":"BLOCK","start":11905,"end":12063,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1611},"to":{"change":6,"start":21814,"end":21984},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;"},{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;\n crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":248807},"path":"libpijul/src/tests/unrecord.rs","line":809,"ins":{"up_context":[{"change":6,"pos":1754}],"down_context":[{"change":6,"pos":27720}],"flag":"BLOCK","start":12064,"end":12090,"inode":{"change":6,"pos":248807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1754},"to":{"change":6,"start":21985,"end":22020},"introduced_by":6}],"inode":{"change":6,"pos":248807}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":12,"ins":{"up_context":[{"change":6,"pos":322}],"down_context":[{"change":6,"pos":378}],"flag":"BLOCK","start":12091,"end":12143,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322},"to":{"change":6,"start":0,"end":62},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":16,"ins":{"up_context":[{"change":6,"pos":469}],"down_context":[{"change":6,"pos":594}],"flag":"BLOCK","start":12144,"end":12289,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469},"to":{"change":6,"start":63,"end":249},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n txn.write().unwrap().add_file(\"file\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":21,"ins":{"up_context":[{"change":6,"pos":647}],"down_context":[{"change":6,"pos":736}],"flag":"BLOCK","start":12290,"end":12367,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":647},"to":{"change":6,"start":250,"end":324},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let (h, change) = record_all_change(&repo, &store, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let (h, change) = record_all_change(repo, &store, txn, channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":56,"ins":{"up_context":[{"change":6,"pos":1539}],"down_context":[{"change":6,"pos":1595}],"flag":"BLOCK","start":12368,"end":12420,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1539},"to":{"change":6,"start":325,"end":387},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":60,"ins":{"up_context":[{"change":6,"pos":1686}],"down_context":[{"change":6,"pos":1811}],"flag":"BLOCK","start":12421,"end":12566,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1686},"to":{"change":6,"start":388,"end":574},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n txn.write().unwrap().add_file(\"file\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":65,"ins":{"up_context":[{"change":6,"pos":1864}],"down_context":[{"change":6,"pos":1928}],"flag":"BLOCK","start":12567,"end":12619,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1864},"to":{"change":6,"start":575,"end":648},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" record_all(&repo, &store, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all(repo.clone(), &store, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":10},"path":"libpijul/src/tests/text.rs","line":75,"ins":{"up_context":[{"change":6,"pos":736}],"down_context":[{"change":6,"pos":2312}],"flag":"BLOCK","start":12620,"end":12699,"inode":{"change":6,"pos":10}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":736},"to":{"change":6,"start":736,"end":828},"introduced_by":6}],"inode":{"change":6,"pos":10}},"ins_contents":[{"Add":" let (h1, change1) = record_all_change(&repo, &store, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let (h1, change1) = record_all_change(repo, &store, txn.clone(), channel.clone(), \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":67}],"down_context":[{"change":6,"pos":67}],"flag":"BLOCK","start":12700,"end":12720,"inode":{"change":6,"pos":14}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":14,"ins":{"up_context":[{"change":6,"pos":361}],"down_context":[{"change":6,"pos":400}],"flag":"BLOCK","start":12721,"end":12769,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361},"to":{"change":6,"start":31032,"end":31080},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":16,"ins":{"up_context":[{"change":6,"pos":401}],"down_context":[{"change":6,"pos":461}],"flag":"BLOCK","start":12770,"end":12846,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401},"to":{"change":6,"start":22273,"end":22341},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let mut channela = txn.write().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut channela = txn.open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":20,"ins":{"up_context":[{"change":6,"pos":561}],"down_context":[{"change":6,"pos":710}],"flag":"BLOCK","start":12847,"end":12956,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":561},"to":{"change":6,"start":22342,"end":22452},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":22452},"to":{"change":6,"start":655,"end":656},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":655},"to":{"change":6,"start":655,"end":656},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":656},"to":{"change":6,"start":22453,"end":22515},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0).unwrap();"},{"Add":" record_all(&repo, &changes, &txn, &channela, \"\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"file\").unwrap();\n record_all(&mut repo, &changes, &mut txn, &mut channela, \"\").unwrap();\n"},{"Del":"\n"},{"Del":" let mut channelb = txn.fork(&channela, \"other\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":23,"ins":{"up_context":[{"change":6,"pos":711}],"down_context":[{"change":6,"pos":905}],"flag":"BLOCK","start":12957,"end":13023,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":711},"to":{"change":6,"start":711,"end":769},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":769},"to":{"change":6,"start":22516,"end":22560},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":22560},"to":{"change":6,"start":805,"end":820},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":805},"to":{"change":6,"start":805,"end":820},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":820},"to":{"change":6,"start":3592,"end":3614},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3614},"to":{"change":6,"start":22578,"end":22662},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22578},"to":{"change":6,"start":22578,"end":22662},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let channelb = txn.write().fork(&channela, \"other\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"a\\nx\\nb\\n\").unwrap();\n"},{"Del":" Ok(())\n"},{"Del":" })\n .unwrap();\n"},{"Del":" let ha = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":25,"ins":{"up_context":[{"change":6,"pos":906}],"down_context":[{"change":6,"pos":1100}],"flag":"BLOCK","start":13024,"end":13194,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":906},"to":{"change":6,"start":906,"end":964},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":964},"to":{"change":6,"start":22663,"end":22707},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":22707},"to":{"change":6,"start":1000,"end":1015},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1000},"to":{"change":6,"start":1000,"end":1015},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1015},"to":{"change":6,"start":3615,"end":3637},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3637},"to":{"change":6,"start":22725,"end":22809},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22725},"to":{"change":6,"start":22725,"end":22809},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" repo.write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\nx\\nb\\n\")"},{"Add":" .unwrap();"},{"Add":" let ha = record_all(&repo, &changes, &txn, &channela, \"\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"a\\ny\\nb\\n\").unwrap();\n"},{"Del":" Ok(())\n"},{"Del":" })\n .unwrap();\n"},{"Del":" let hb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":31,"ins":{"up_context":[{"change":6,"pos":1101}],"down_context":[{"change":6,"pos":1231}],"flag":"BLOCK","start":13195,"end":13365,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1101},"to":{"change":6,"start":22810,"end":22958},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" repo.write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\ny\\nb\\n\")"},{"Add":" .unwrap();"},{"Add":" let hb = record_all(&repo, &changes, &txn, &channelb, \"\").unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channelb, &ha).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channela, &hb).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":37,"ins":{"up_context":[{"change":6,"pos":1232}],"down_context":[{"change":6,"pos":1344}],"flag":"BLOCK","start":13366,"end":13506,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1232},"to":{"change":6,"start":22959,"end":23087},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channelb, &ha).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channela, &hb).unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn, &channela.borrow(), \"debuga\").unwrap();\n debug_to_file(&txn, &channelb.borrow(), \"debugb\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":40,"ins":{"up_context":[{"change":6,"pos":1345}],"down_context":[{"change":6,"pos":1444}],"flag":"BLOCK","start":13507,"end":13623,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1345},"to":{"change":6,"start":3638,"end":3819},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channela, \"\", true, None, 1, 0)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" output::output_repository_no_pending(\n &mut repo,\n &changes,\n &mut txn,\n &mut channela,\n \"\",\n true,\n None,\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":48,"ins":{"up_context":[{"change":6,"pos":23331}],"down_context":[{"change":6,"pos":1726}],"flag":"BLOCK","start":13624,"end":13684,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":23331},"to":{"change":6,"start":1668,"end":1726},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1668},"to":{"change":6,"start":1668,"end":1726},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":53,"ins":{"up_context":[{"change":6,"pos":1830}],"down_context":[{"change":6,"pos":1854}],"flag":"BLOCK","start":13685,"end":13691,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1830},"to":{"change":6,"start":1830,"end":1845},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1845},"to":{"change":6,"start":3820,"end":3842},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n"},{"Del":" })\n .unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":59,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":23527},"to":{"change":6,"start":23527,"end":23593},"introduced_by":6}],"inode":{"change":6,"pos":14}}},"contents":[{"Del":" debug_to_file(&txn, &channela.borrow(), \"debugres\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":71,"ins":{"up_context":[{"change":6,"pos":23648}],"down_context":[{"change":6,"pos":2582}],"flag":"BLOCK","start":13692,"end":13765,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":23648},"to":{"change":6,"start":23648,"end":23788},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channela, &h_inv).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channela, &h_inv).unwrap();\n debug_to_file(&txn, &channela.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":83,"ins":{"up_context":[{"change":6,"pos":2876}],"down_context":[{"change":6,"pos":2915}],"flag":"BLOCK","start":13766,"end":13810,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2876},"to":{"change":6,"start":31081,"end":31129},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":85,"ins":{"up_context":[{"change":6,"pos":2916}],"down_context":[{"change":6,"pos":2976}],"flag":"BLOCK","start":13811,"end":13875,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2916},"to":{"change":6,"start":2916,"end":2976},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let channela = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut channela = txn.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":89,"ins":{"up_context":[{"change":6,"pos":3076}],"down_context":[{"change":6,"pos":3170}],"flag":"BLOCK","start":13876,"end":13973,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3076},"to":{"change":6,"start":3076,"end":3170},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" record_all(&mut repo, &changes, &txn, &channela, \"\")?;"}],"del_contents":[{"Del":" txn.add_file(\"file\")?;\n record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":92,"ins":{"up_context":[{"change":6,"pos":3171}],"down_context":[{"change":6,"pos":3225}],"flag":"BLOCK","start":13974,"end":14032,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3171},"to":{"change":6,"start":3171,"end":3225},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let channelb = txn.write().fork(&channela, \"other\")?;"}],"del_contents":[{"Del":" let mut channelb = txn.fork(&channela, \"other\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":94,"ins":{"up_context":[{"change":6,"pos":3226}],"down_context":[{"change":6,"pos":3420}],"flag":"BLOCK","start":14033,"end":14195,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3226},"to":{"change":6,"start":3226,"end":3420},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" repo.write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\nx\\nb\\n\")"},{"Add":" .unwrap();"},{"Add":" let ha = record_all(&repo, &changes, &txn, &channela, \"\")?;"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n w.write_all(b\"a\\nx\\nb\\n\")?;\n Ok(())\n })?;\n let ha = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":100,"ins":{"up_context":[{"change":6,"pos":3421}],"down_context":[{"change":6,"pos":3615}],"flag":"BLOCK","start":14196,"end":14323,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3421},"to":{"change":6,"start":3421,"end":3615},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(b\"a\\ny\\nb\\n\")?;"},{"Add":" let hb = record_all(&repo, &changes, &txn, &channelb, \"\")?;"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n w.write_all(b\"a\\ny\\nb\\n\")?;\n Ok(())\n })?;\n let hb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":103,"ins":{"up_context":[{"change":6,"pos":3616}],"down_context":[{"change":6,"pos":3859}],"flag":"BLOCK","start":14324,"end":14448,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3616},"to":{"change":6,"start":23789,"end":23921},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":23921},"to":{"change":6,"start":3746,"end":3859},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3746},"to":{"change":6,"start":3746,"end":3859},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channelb, &ha)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channela, &hb)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channelb, &ha)?;\n apply::apply_change(&changes, &mut txn, &mut channela, &hb)?;\n"},{"Del":"\n debug_to_file(&txn, &channela.borrow(), \"debuga\")?;\n debug_to_file(&txn, &channelb.borrow(), \"debugb\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":106,"ins":{"up_context":[{"change":6,"pos":3860}],"down_context":[{"change":6,"pos":3959}],"flag":"BLOCK","start":14449,"end":14548,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3860},"to":{"change":6,"start":3843,"end":4011},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channela, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" output::output_repository_no_pending(\n &mut repo,\n &changes,\n &mut txn,\n &mut channela,\n \"\",\n true,\n None,\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":113,"ins":{"up_context":[{"change":6,"pos":4183}],"down_context":[{"change":6,"pos":4241}],"flag":"BLOCK","start":14549,"end":14609,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4183},"to":{"change":6,"start":4183,"end":4241},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":118,"ins":{"up_context":[{"change":6,"pos":4345}],"down_context":[{"change":6,"pos":4369}],"flag":"BLOCK","start":14610,"end":14616,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4345},"to":{"change":6,"start":4345,"end":4369},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":123,"ins":{"up_context":[{"change":6,"pos":4480}],"down_context":[{"change":6,"pos":4616}],"flag":"BLOCK","start":14617,"end":14683,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4480},"to":{"change":6,"start":4480,"end":4616},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" let resb = record_all(&repo, &changes, &txn, &channelb, \"\")?;"}],"del_contents":[{"Del":" let resb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\")?;\n debug_to_file(&txn, &channelb.borrow(), \"debugres\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":14},"path":"libpijul/src/tests/rollback.rs","line":136,"ins":{"up_context":[{"change":6,"pos":4962}],"down_context":[{"change":6,"pos":5085}],"flag":"BLOCK","start":14684,"end":14749,"inode":{"change":6,"pos":14}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4962},"to":{"change":6,"start":24028,"end":24097},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24097},"to":{"change":6,"start":5030,"end":5085},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5030},"to":{"change":6,"start":5030,"end":5085},"introduced_by":6}],"inode":{"change":6,"pos":14}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channelb, &h_inv)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channelb, &h_inv)?;\n"},{"Del":" debug_to_file(&txn, &channelb.borrow(), \"debug\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":11,"ins":{"up_context":[{"change":6,"pos":276303}],"down_context":[{"change":6,"pos":276425}],"flag":"BLOCK","start":14750,"end":14864,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":276303},"to":{"change":6,"start":276303,"end":276425},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":17,"ins":{"up_context":[{"change":6,"pos":276599}],"down_context":[{"change":6,"pos":276650}],"flag":"BLOCK","start":14865,"end":14921,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":276599},"to":{"change":6,"start":31130,"end":31190},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":19,"ins":{"up_context":[{"change":6,"pos":276712}],"down_context":[{"change":6,"pos":276839}],"flag":"BLOCK","start":14922,"end":15058,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":276712},"to":{"change":6,"start":31191,"end":31247},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31247},"to":{"change":6,"start":276759,"end":276839},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":276759},"to":{"change":6,"start":276759,"end":276839},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":22,"ins":{"up_context":[{"change":6,"pos":276840}],"down_context":[{"change":6,"pos":277090}],"flag":"BLOCK","start":15059,"end":15199,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":276840},"to":{"change":6,"start":276840,"end":277028},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277028},"to":{"change":6,"start":5507,"end":5580},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/c/d\", 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/c/d\").unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":26,"ins":{"up_context":[{"change":6,"pos":277109}],"down_context":[{"change":6,"pos":277267}],"flag":"BLOCK","start":15200,"end":15359,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277109},"to":{"change":6,"start":277109,"end":277183},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277183},"to":{"change":6,"start":24098,"end":24183},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":29,"ins":{"up_context":[{"change":6,"pos":277309}],"down_context":[{"change":6,"pos":277332}],"flag":"BLOCK","start":15360,"end":15379,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277309},"to":{"change":6,"start":277309,"end":277332},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":31,"ins":{"up_context":[{"change":6,"pos":277350}],"down_context":[{"change":6,"pos":277398}],"flag":"BLOCK","start":15380,"end":15420,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277350},"to":{"change":6,"start":277350,"end":277398},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":36,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":24198}],"down_context":[{"change":6,"pos":277424}],"flag":"BLOCK","start":15421,"end":15443,"inode":{"change":6,"pos":276051}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":39,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277432},"to":{"change":6,"start":5581,"end":5648},"introduced_by":6}],"inode":{"change":6,"pos":276051}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":43,"ins":{"up_context":[{"change":6,"pos":277614}],"down_context":[{"change":6,"pos":277768}],"flag":"BLOCK","start":15444,"end":15530,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277614},"to":{"change":6,"start":277614,"end":277712},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277712},"to":{"change":6,"start":5649,"end":5716},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":46,"ins":{"up_context":[{"change":6,"pos":277803}],"down_context":[{"change":6,"pos":277944}],"flag":"BLOCK","start":15531,"end":15607,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277803},"to":{"change":6,"start":24199,"end":24279},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24279},"to":{"change":6,"start":5717,"end":5790},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277882},"to":{"change":6,"start":5717,"end":5790},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":48,"ins":{"up_context":[{"change":6,"pos":277986}],"down_context":[{"change":6,"pos":278011}],"flag":"BLOCK","start":15608,"end":15629,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":277986},"to":{"change":6,"start":277986,"end":278011},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":50,"ins":{"up_context":[{"change":6,"pos":278029}],"down_context":[{"change":6,"pos":278081}],"flag":"BLOCK","start":15630,"end":15674,"inode":{"change":6,"pos":276051}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278029},"to":{"change":6,"start":278029,"end":278081},"introduced_by":6}],"inode":{"change":6,"pos":276051}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":276051},"path":"libpijul/src/tests/rm_file.rs","line":55,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":24294}],"down_context":[{"change":6,"pos":278107}],"flag":"BLOCK","start":15675,"end":15697,"inode":{"change":6,"pos":276051}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":278254}],"down_context":[{"change":6,"pos":278254}],"flag":"BLOCK","start":15698,"end":15718,"inode":{"change":6,"pos":278146}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":17,"ins":{"up_context":[{"change":6,"pos":278660}],"down_context":[{"change":6,"pos":278766}],"flag":"BLOCK","start":15719,"end":15834,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278660},"to":{"change":6,"start":31248,"end":31296},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31296},"to":{"change":6,"start":278699,"end":278766},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278699},"to":{"change":6,"start":278699,"end":278766},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":20,"ins":{"up_context":[{"change":6,"pos":278767}],"down_context":[{"change":6,"pos":278919}],"flag":"BLOCK","start":15835,"end":15939,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278767},"to":{"change":6,"start":278767,"end":278868},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278868},"to":{"change":6,"start":5791,"end":5853},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" record_all(&mut repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"file\")?;\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":24,"ins":{"up_context":[{"change":6,"pos":278957}],"down_context":[{"change":6,"pos":279403}],"flag":"BLOCK","start":15940,"end":16243,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278957},"to":{"change":6,"start":1193,"end":1255},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1255},"to":{"change":6,"start":278995,"end":279333},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":278995},"to":{"change":6,"start":278995,"end":279333},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":279333},"to":{"change":6,"start":5854,"end":5935},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut w = repo.write_file(\"file\").unwrap();"},{"Add":" for j in 0..i {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" w.write_all(&contents[..])?;"},{"Add":" for j in (0..i).rev() {"},{"Add":" writeln!(w, \"{}\", j)?;"},{"Add":" }"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" for j in 0..i {\n writeln!(w, \"{}\", j)?;\n }\n w.write_all(&contents[..])?;\n for j in (0..i).rev() {\n writeln!(w, \"{}\", j)?;\n }\n Ok(())\n })\n .unwrap();\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), &format!(\"debug{}\", i)).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":34,"ins":{"up_context":[{"change":6,"pos":279409}],"down_context":[{"change":6,"pos":279443}],"flag":"BLOCK","start":16244,"end":16304,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":279409},"to":{"change":6,"start":1256,"end":1314},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":42,"ins":{"up_context":[{"change":6,"pos":279589}],"down_context":[{"change":6,"pos":279757}],"flag":"BLOCK","start":16305,"end":16373,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":279589},"to":{"change":6,"start":279589,"end":279700},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":279700},"to":{"change":6,"start":5936,"end":6004},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" }"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" Ok(())\n })\n .unwrap();\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug_final\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":46,"ins":{"up_context":[{"change":6,"pos":279819}],"down_context":[{"change":6,"pos":6005}],"flag":"BLOCK","start":16374,"end":16412,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":279819},"to":{"change":6,"start":279819,"end":279859},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":48,"ins":{"up_context":[{"change":6,"pos":6028}],"down_context":[{"change":6,"pos":6164}],"flag":"BLOCK","start":16413,"end":16569,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6028},"to":{"change":6,"start":574,"end":642},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":642},"to":{"change":6,"start":6090,"end":6164},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6090},"to":{"change":6,"start":6090,"end":6164},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut it = txn.read().iter_graph(&channel.graph, None).unwrap();"},{"Add":" while let Some(Ok(_)) = txn.read().next_graph(&channel.graph, &mut it) {"}],"del_contents":[{"Del":" let mut it = txn.iter_graph(&channel.graph, None).unwrap();\n"},{"Del":" while let Some(Ok(_)) = txn.next_graph(&channel.graph, &mut it) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":75,"ins":{"up_context":[{"change":6,"pos":24391}],"down_context":[{"change":6,"pos":280608}],"flag":"BLOCK","start":16570,"end":16689,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":24391},"to":{"change":6,"start":31297,"end":31345},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31345},"to":{"change":6,"start":280541,"end":280608},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280541},"to":{"change":6,"start":280541,"end":280608},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":78,"ins":{"up_context":[{"change":6,"pos":280609}],"down_context":[{"change":6,"pos":24428}],"flag":"BLOCK","start":16690,"end":16802,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280609},"to":{"change":6,"start":24392,"end":24427},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24427},"to":{"change":6,"start":280636,"end":280710},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280636},"to":{"change":6,"start":280636,"end":280710},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280710},"to":{"change":6,"start":6194,"end":6256},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0).unwrap();"},{"Add":" record_all(&mut repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" txn.add_file(\"file\").unwrap();\n"},{"Del":" record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":82,"ins":{"up_context":[{"change":6,"pos":280798}],"down_context":[{"change":6,"pos":281244}],"flag":"BLOCK","start":16803,"end":17130,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280798},"to":{"change":6,"start":1315,"end":1377},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1377},"to":{"change":6,"start":280836,"end":280864},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280836},"to":{"change":6,"start":280836,"end":280864},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280864},"to":{"change":6,"start":24445,"end":24492},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24492},"to":{"change":6,"start":280903,"end":280917},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280903},"to":{"change":6,"start":280903,"end":280917},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280917},"to":{"change":6,"start":24493,"end":24542},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24542},"to":{"change":6,"start":280958,"end":280994},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280958},"to":{"change":6,"start":280958,"end":280994},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":280994},"to":{"change":6,"start":24543,"end":24590},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24590},"to":{"change":6,"start":281033,"end":281174},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281033},"to":{"change":6,"start":281033,"end":281174},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281174},"to":{"change":6,"start":6257,"end":6338},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut w = repo.write_file(\"file\").unwrap();"},{"Add":" for j in 0..i {"},{"Add":" writeln!(w, \"{}\", j).unwrap();"},{"Add":" }"},{"Add":" w.write_all(&contents[..]).unwrap();"},{"Add":" for j in (0..i).rev() {"},{"Add":" writeln!(w, \"{}\", j).unwrap();"},{"Add":" }"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" for j in 0..i {\n"},{"Del":" writeln!(w, \"{}\", j).unwrap();\n"},{"Del":" }\n"},{"Del":" w.write_all(&contents[..]).unwrap();\n"},{"Del":" for j in (0..i).rev() {\n"},{"Del":" writeln!(w, \"{}\", j).unwrap();\n"},{"Del":" }\n Ok(())\n })\n .unwrap();\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), &format!(\"debug{}\", i)).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":92,"ins":{"up_context":[{"change":6,"pos":281250}],"down_context":[{"change":6,"pos":281336}],"flag":"BLOCK","start":17131,"end":17259,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281250},"to":{"change":6,"start":24591,"end":24651},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24651},"to":{"change":6,"start":1378,"end":1436},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281302},"to":{"change":6,"start":1378,"end":1436},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut channel2 = txn.write().fork(&channel, \"fork\").unwrap();"},{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" let mut channel2 = txn.fork(&channel, \"fork\").unwrap();\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":102,"ins":{"up_context":[{"change":6,"pos":281530}],"down_context":[{"change":6,"pos":24797}],"flag":"BLOCK","start":17260,"end":17266,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281530},"to":{"change":6,"start":281530,"end":281567},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":107,"ins":{"up_context":[{"change":6,"pos":4043}],"down_context":[{"change":6,"pos":4133}],"flag":"BLOCK","start":17267,"end":17409,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4043},"to":{"change":6,"start":4043,"end":4133},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" &txn.read().txn,"},{"Add":" &["},{"Add":" txn.read().graph(&channel.read()),"},{"Add":" txn.read().graph(&channel2.read()),"},{"Add":" ],"}],"del_contents":[{"Del":" &txn.txn,\n &[txn.graph(&channel.borrow()), txn.graph(&channel2.borrow())],\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":116,"ins":{"up_context":[{"change":6,"pos":281709}],"down_context":[{"change":6,"pos":281743}],"flag":"BLOCK","start":17410,"end":17470,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":24955},"to":{"change":6,"start":24955,"end":25023},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":25023},"to":{"change":6,"start":1437,"end":1495},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281709},"to":{"change":6,"start":1437,"end":1495},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn, &channel2.borrow(), \"debug_bob0\").unwrap();\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":124,"ins":{"up_context":[{"change":6,"pos":281889}],"down_context":[{"change":6,"pos":25112}],"flag":"BLOCK","start":17471,"end":17548,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":281889},"to":{"change":6,"start":281889,"end":282009},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" }"},{"Add":" let p2 = record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" Ok(())\n })\n .unwrap();\n let p2 = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":127,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":25113},"to":{"change":6,"start":6408,"end":6477},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282009},"to":{"change":6,"start":6408,"end":6477},"introduced_by":6}],"inode":{"change":6,"pos":278146}}},"contents":[{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":128,"ins":{"up_context":[{"change":6,"pos":282094}],"down_context":[{"change":6,"pos":282202}],"flag":"BLOCK","start":17549,"end":17644,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282094},"to":{"change":6,"start":25114,"end":25174},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":25174},"to":{"change":6,"start":6478,"end":6546},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282145},"to":{"change":6,"start":6478,"end":6546},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" txn.write()"},{"Add":" .apply_change(&changes, &mut *channel.write(), &p1)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" txn.apply_change(&changes, &mut channel, &p1).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug_alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":132,"ins":{"up_context":[{"change":6,"pos":282229}],"down_context":[{"change":6,"pos":282337}],"flag":"BLOCK","start":17645,"end":17741,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282229},"to":{"change":6,"start":25175,"end":25236},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":25236},"to":{"change":6,"start":6547,"end":6614},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282281},"to":{"change":6,"start":6547,"end":6614},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" txn.write()"},{"Add":" .apply_change(&changes, &mut *channel2.write(), &p2)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" txn.apply_change(&changes, &mut channel2, &p2).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel2.borrow(), \"debug_bob\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":138,"ins":{"up_context":[{"change":6,"pos":282400}],"down_context":[{"change":6,"pos":6615}],"flag":"BLOCK","start":17742,"end":17780,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282400},"to":{"change":6,"start":282400,"end":282440},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.borrow();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":140,"ins":{"up_context":[{"change":6,"pos":6638}],"down_context":[{"change":6,"pos":6774}],"flag":"BLOCK","start":17781,"end":17937,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6638},"to":{"change":6,"start":643,"end":711},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":711},"to":{"change":6,"start":6700,"end":6774},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6700},"to":{"change":6,"start":6700,"end":6774},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut it = txn.read().iter_graph(&channel.graph, None).unwrap();"},{"Add":" while let Some(Ok(_)) = txn.read().next_graph(&channel.graph, &mut it) {"}],"del_contents":[{"Del":" let mut it = txn.iter_graph(&channel.graph, None).unwrap();\n"},{"Del":" while let Some(Ok(_)) = txn.next_graph(&channel.graph, &mut it) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":151,"ins":{"up_context":[{"change":6,"pos":282696}],"down_context":[{"change":6,"pos":6804}],"flag":"BLOCK","start":17938,"end":17977,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":282696},"to":{"change":6,"start":282696,"end":282737},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let channel = channel2.read();"}],"del_contents":[{"Del":" let channel = channel2.borrow();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":278146},"path":"libpijul/src/tests/performance.rs","line":153,"ins":{"up_context":[{"change":6,"pos":6827}],"down_context":[{"change":6,"pos":6963}],"flag":"BLOCK","start":17978,"end":18134,"inode":{"change":6,"pos":278146}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6827},"to":{"change":6,"start":712,"end":780},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":780},"to":{"change":6,"start":6889,"end":6963},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6889},"to":{"change":6,"start":6889,"end":6963},"introduced_by":6}],"inode":{"change":6,"pos":278146}},"ins_contents":[{"Add":" let mut it = txn.read().iter_graph(&channel.graph, None).unwrap();"},{"Add":" while let Some(Ok(_)) = txn.read().next_graph(&channel.graph, &mut it) {"}],"del_contents":[{"Del":" let mut it = txn.iter_graph(&channel.graph, None).unwrap();\n"},{"Del":" while let Some(Ok(_)) = txn.next_graph(&channel.graph, &mut it) {\n"}]}},{"Edit":{"inode":{"change":6,"pos":283038},"path":"libpijul/src/tests/patch.rs","line":87,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":285162},"to":{"change":6,"start":13243,"end":13313},"introduced_by":6}],"inode":{"change":6,"pos":283038}}},"contents":[{"Del":"debug_to_file(&debug_to_file((debug_to_file((txn, &branch, \"debug\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":285294},"to":{"change":6,"start":285294,"end":285295},"introduced_by":6}],"inode":{"change":6,"pos":285224}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":285333}],"down_context":[{"change":6,"pos":285333}],"flag":"BLOCK","start":18135,"end":18155,"inode":{"change":6,"pos":285224}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":18,"ins":{"up_context":[{"change":6,"pos":285788}],"down_context":[{"change":6,"pos":285827}],"flag":"BLOCK","start":18156,"end":18200,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":285788},"to":{"change":6,"start":31346,"end":31394},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":20,"ins":{"up_context":[{"change":6,"pos":285833}],"down_context":[{"change":6,"pos":286228}],"flag":"BLOCK","start":18201,"end":18601,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":285833},"to":{"change":6,"start":285833,"end":286228},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" txn.write().add_file(\"a/b/c\", 0)?;"},{"Add":" record_all(&mut repo, &changes, &txn, &channel, \"\")?;"},{"Add":" txn.write().add_file(\"d/e/f\", 0)?;"},{"Add":" let hd = record_all(&repo, &changes, &txn, &channel, \"\")?;"},{"Add":" txn.write().add_file(\"g/h/i\", 0)?;"},{"Add":" let hg = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n txn.add_file(\"a/b/c\")?;\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n txn.add_file(\"d/e/f\")?;\n let hd = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n txn.add_file(\"g/h/i\")?;\n let hg = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":29,"ins":{"up_context":[{"change":6,"pos":286270}],"down_context":[{"change":6,"pos":286395}],"flag":"BLOCK","start":18602,"end":18726,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":286270},"to":{"change":6,"start":286270,"end":286395},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" txn.write().move_file(\"g/h/i\", \"d/e/ff\", 0)?;"},{"Add":" let hmove = record_all(&repo, &changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.move_file(\"g/h/i\", \"d/e/ff\")?;\n let hmove = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":32,"ins":{"up_context":[{"change":6,"pos":286396}],"down_context":[{"change":6,"pos":28057}],"flag":"BLOCK","start":18727,"end":18864,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":286396},"to":{"change":6,"start":6993,"end":7059},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7059},"to":{"change":6,"start":286451,"end":286507},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":13371},"to":{"change":6,"start":286451,"end":286507},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":286451},"to":{"change":6,"start":286451,"end":286507},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":286507},"to":{"change":6,"start":25435,"end":25501},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let inode = crate::fs::find_inode(&*txn.read(), \"d\")?;"},{"Add":" let key = *txn.read().get_inodes(&inode, None).unwrap().unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\").unwrap();\n"},{"Del":"\n let inode = crate::fs::find_inode(&txn, \"d\")?;\n"},{"Del":" let key = txn.get_inodes(&inode, None).unwrap().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":35,"ins":{"up_context":[{"change":6,"pos":28091}],"down_context":[{"change":6,"pos":28144}],"flag":"BLOCK","start":18865,"end":18937,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28091},"to":{"change":6,"start":25502,"end":25556},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" .read()"},{"Add":" .log_for_path(&*channel.read(), key, 0)"}],"del_contents":[{"Del":" .log_for_path(&channel.borrow(), *key, 0)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":60,"ins":{"up_context":[{"change":6,"pos":287232}],"down_context":[{"change":6,"pos":287271}],"flag":"BLOCK","start":18938,"end":18986,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287232},"to":{"change":6,"start":31395,"end":31443},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":62,"ins":{"up_context":[{"change":6,"pos":287285}],"down_context":[{"change":6,"pos":287458}],"flag":"BLOCK","start":18987,"end":19201,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287285},"to":{"change":6,"start":287285,"end":287458},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let mut channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" txn.write().add_file(\"a/b/c/d\", 0)?;"},{"Add":" txn.write().add_file(\"e/f/g/h\", 0)?;"},{"Add":" txn.write().add_file(\"i/j/k/l\", 0)?;"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n txn.add_file(\"a/b/c/d\")?;\n txn.add_file(\"e/f/g/h\")?;\n txn.add_file(\"i/j/k/l\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":69,"ins":{"up_context":[{"change":6,"pos":287549}],"down_context":[{"change":6,"pos":287918}],"flag":"BLOCK","start":19202,"end":19477,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287549},"to":{"change":6,"start":287549,"end":287620},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287620},"to":{"change":6,"start":1496,"end":1561},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1561},"to":{"change":6,"start":287661,"end":287731},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287661},"to":{"change":6,"start":287661,"end":287731},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287731},"to":{"change":6,"start":1562,"end":1627},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1627},"to":{"change":6,"start":287772,"end":287918},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287772},"to":{"change":6,"start":287772,"end":287918},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" repo.write_file(\"a/b/c/d\").unwrap().write_all(b\"edits\\n\")?;"},{"Add":" repo.write_file(\"e/f/g/h\").unwrap().write_all(b\"edits\\n\")?;"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"a/b/c/d\")?"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"a/b/c/d\", |w| {\n"},{"Del":" w.write_all(b\"edits\\n\")?;\n Ok(())\n })?;\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"e/f/g/h\", |w| {\n"},{"Del":" w.write_all(b\"edits\\n\")?;\n Ok(())\n })?;\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"a/b/c/d\")?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":79,"ins":{"up_context":[{"change":6,"pos":287992}],"down_context":[{"change":6,"pos":288049}],"flag":"BLOCK","start":19478,"end":19531,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":287992},"to":{"change":6,"start":287992,"end":288049},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let repo2 = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo2 = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":81,"ins":{"up_context":[{"change":6,"pos":288108}],"down_context":[{"change":6,"pos":288149}],"flag":"BLOCK","start":19532,"end":19578,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288108},"to":{"change":6,"start":31444,"end":31494},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":83,"ins":{"up_context":[{"change":6,"pos":288155}],"down_context":[{"change":6,"pos":288304}],"flag":"BLOCK","start":19579,"end":19729,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288155},"to":{"change":6,"start":288155,"end":288228},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288228},"to":{"change":6,"start":25557,"end":25634},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" let channel = txn2.write().open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn2, &channel, &h).unwrap();"}],"del_contents":[{"Del":" let mut channel = txn2.open_or_create_channel(\"main2\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, &h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":86,"ins":{"up_context":[{"change":6,"pos":288350}],"down_context":[{"change":6,"pos":288482}],"flag":"BLOCK","start":19730,"end":19802,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288350},"to":{"change":6,"start":288350,"end":288482},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288482},"to":{"change":6,"start":25635,"end":25653},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" &repo2, &changes, &txn2, &channel, \"e/f\", true, None, 1, 0,"}],"del_contents":[{"Del":" &mut repo2,\n &changes,\n &mut txn2,\n &mut channel,\n \"e/f\",\n true,\n"},{"Del":" None,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":96,"ins":{"up_context":[{"change":6,"pos":288704}],"down_context":[{"change":6,"pos":288781}],"flag":"BLOCK","start":19803,"end":19877,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288704},"to":{"change":6,"start":25654,"end":25732},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn2, &channel, &h2).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, &h2).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":285224},"path":"libpijul/src/tests/partial.rs","line":98,"ins":{"up_context":[{"change":6,"pos":288827}],"down_context":[{"change":6,"pos":288956}],"flag":"BLOCK","start":19878,"end":19947,"inode":{"change":6,"pos":285224}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288827},"to":{"change":6,"start":288827,"end":288956},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":288956},"to":{"change":6,"start":25733,"end":25751},"introduced_by":6}],"inode":{"change":6,"pos":285224}},"ins_contents":[{"Add":" &repo2, &changes, &txn2, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" &mut repo2,\n &changes,\n &mut txn2,\n &mut channel,\n \"\",\n true,\n"},{"Del":" None,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":1,"ins":{"up_context":[{"change":6,"pos":289338}],"down_context":[{"change":6,"pos":289394}],"flag":"BLOCK","start":19948,"end":19975,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289338},"to":{"change":6,"start":182,"end":223},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":"use crate::change::Change;"}],"del_contents":[{"Del":"use crate::change::{Local, LocalChange};\n"}]}},{"Edit":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289563},"to":{"change":6,"start":31546,"end":31577},"introduced_by":6}],"inode":{"change":6,"pos":289338}}},"contents":[{"Del":"\nuse std::sync::{Arc, RwLock};\n"}]}},{"Edit":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289578},"to":{"change":6,"start":22021,"end":22024},"introduced_by":6}],"inode":{"change":6,"pos":289338}}},"contents":[{"Del":"/*\n"}]}},{"Edit":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":20,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":14},"to":{"change":6,"start":289715,"end":289729},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4367},"to":{"change":6,"start":289715,"end":289729},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":22029},"to":{"change":6,"start":289715,"end":289729},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289715},"to":{"change":6,"start":289715,"end":289729},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289729},"to":{"change":6,"start":829,"end":832},"introduced_by":6}],"inode":{"change":6,"pos":289338}}},"contents":[{"Del":"mod unrecord;\n"},{"Del":"*/\n"}]}},{"Edit":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":21,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":842}],"down_context":[{"change":6,"pos":289729}],"flag":"BLOCK","start":19976,"end":19990,"inode":{"change":6,"pos":289338}}},"contents":[{"Add":"mod unrecord;"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":25,"ins":{"up_context":[{"change":6,"pos":22085}],"down_context":[{"change":6,"pos":22129}],"flag":"BLOCK","start":19991,"end":20043,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22085},"to":{"change":6,"start":22085,"end":22129},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":28,"ins":{"up_context":[{"change":6,"pos":22184}],"down_context":[{"change":6,"pos":289813}],"flag":"BLOCK","start":20044,"end":20058,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22184},"to":{"change":6,"start":22184,"end":22202},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":30,"ins":{"up_context":[{"change":6,"pos":289828}],"down_context":[{"change":6,"pos":289878}],"flag":"BLOCK","start":20059,"end":20109,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289828},"to":{"change":6,"start":22203,"end":22228},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22228},"to":{"change":6,"start":22228,"end":22256},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n"},{"Del":" channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":33,"ins":{"up_context":[{"change":6,"pos":289896}],"down_context":[{"change":6,"pos":1661}],"flag":"BLOCK","start":20110,"end":20153,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":289896},"to":{"change":6,"start":292,"end":347},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":") -> Result<(Hash, Change), anyhow::Error>"}],"del_contents":[{"Del":") -> Result<(Hash, LocalChange), anyhow::Error>\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":52,"ins":{"up_context":[{"change":6,"pos":290134}],"down_context":[{"change":6,"pos":290173}],"flag":"BLOCK","start":20154,"end":20211,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":290134},"to":{"change":6,"start":22317,"end":22383},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn.read()).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&*txn.read().unwrap()).unwrap())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":55,"ins":{"up_context":[{"change":6,"pos":290247}],"down_context":[{"change":6,"pos":22415}],"flag":"BLOCK","start":20212,"end":20234,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":290247},"to":{"change":6,"start":22384,"end":22415},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" &*txn.read(),"}],"del_contents":[{"Del":" &*txn.read().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":58,"ins":{"up_context":[{"change":6,"pos":290295}],"down_context":[{"change":6,"pos":290317}],"flag":"BLOCK","start":20235,"end":20286,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":290295},"to":{"change":6,"start":22442,"end":22502},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" std::mem::take(&mut *rec.contents.lock()),"}],"del_contents":[{"Del":" std::mem::take(&mut *rec.contents.lock().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":84,"ins":{"up_context":[{"change":6,"pos":22534}],"down_context":[{"change":6,"pos":22570}],"flag":"BLOCK","start":20287,"end":20314,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22534},"to":{"change":6,"start":22534,"end":22570},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" &mut *txn.write(),"}],"del_contents":[{"Del":" &mut *txn.write().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":94,"ins":{"up_context":[{"change":6,"pos":434}],"down_context":[{"change":6,"pos":452}],"flag":"BLOCK","start":20315,"end":20329,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":434},"to":{"change":6,"start":868,"end":886},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":96,"ins":{"up_context":[{"change":6,"pos":467}],"down_context":[{"change":6,"pos":517}],"flag":"BLOCK","start":20330,"end":20380,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":467},"to":{"change":6,"start":887,"end":912},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":912},"to":{"change":6,"start":912,"end":940},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n"},{"Del":" channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":102,"ins":{"up_context":[{"change":6,"pos":981}],"down_context":[{"change":6,"pos":1025}],"flag":"BLOCK","start":20381,"end":20433,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":981},"to":{"change":6,"start":981,"end":1025},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":106,"ins":{"up_context":[{"change":6,"pos":613}],"down_context":[{"change":6,"pos":291146}],"flag":"BLOCK","start":20434,"end":20509,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":708},"to":{"change":6,"start":0,"end":83},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":613},"to":{"change":6,"start":0,"end":83},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" let (hash, _) = record_all_change(repo, store, txn, channel, prefix)?;"}],"del_contents":[{"Del":" let (hash, _) = record_all_change(repo, store, txn, channel, prefix).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":112,"ins":{"up_context":[{"change":6,"pos":31725}],"down_context":[{"change":6,"pos":31769}],"flag":"BLOCK","start":20510,"end":20562,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31725},"to":{"change":6,"start":31725,"end":31769},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":115,"ins":{"up_context":[{"change":6,"pos":31824}],"down_context":[{"change":6,"pos":22655}],"flag":"BLOCK","start":20563,"end":20577,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31824},"to":{"change":6,"start":31824,"end":31842},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":117,"ins":{"up_context":[{"change":6,"pos":22671}],"down_context":[{"change":6,"pos":291344}],"flag":"BLOCK","start":20578,"end":20628,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":22671},"to":{"change":6,"start":31863,"end":31888},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31863},"to":{"change":6,"start":31863,"end":31888},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31888},"to":{"change":6,"start":22672,"end":22700},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n"},{"Del":" channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":123,"ins":{"up_context":[{"change":6,"pos":1118}],"down_context":[{"change":6,"pos":1162}],"flag":"BLOCK","start":20629,"end":20681,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1118},"to":{"change":6,"start":1118,"end":1162},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":127,"ins":{"up_context":[{"change":6,"pos":1785}],"down_context":[{"change":6,"pos":291552}],"flag":"BLOCK","start":20682,"end":20860,"inode":{"change":6,"pos":289338}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1785},"to":{"change":6,"start":22701,"end":22791},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22791},"to":{"change":6,"start":22791,"end":22833},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22833},"to":{"change":6,"start":22833,"end":22855},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22855},"to":{"change":6,"start":22855,"end":22962},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22962},"to":{"change":6,"start":1215,"end":1226},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1226},"to":{"change":6,"start":22962,"end":22983},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22962},"to":{"change":6,"start":22962,"end":22983},"introduced_by":6}],"inode":{"change":6,"pos":289338}},"ins_contents":[{"Add":" let hash = record_all(repo, &changes, txn, channel, prefix)?;"},{"Add":" output::output_repository_no_pending(repo, &changes, txn, channel, \"\", true, None, 1, 0)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let hash = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), prefix)?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo.clone(),\n"},{"Del":" &changes,\n txn,\n channel.clone(),\n \"\",\n true,\n None,\n 1,\n"},{"Del":" 0,\n"},{"Del":" )\n .unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":291659},"to":{"change":6,"start":291659,"end":291660},"introduced_by":6}],"inode":{"change":6,"pos":291589}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":291698}],"down_context":[{"change":6,"pos":291698}],"flag":"BLOCK","start":20861,"end":20881,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":22,"ins":{"up_context":[{"change":6,"pos":292142}],"down_context":[{"change":6,"pos":292204}],"flag":"BLOCK","start":20882,"end":20940,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292142},"to":{"change":6,"start":292142,"end":292204},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":27,"ins":{"up_context":[{"change":6,"pos":292375}],"down_context":[{"change":6,"pos":292703}],"flag":"BLOCK","start":20941,"end":21225,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292375},"to":{"change":6,"start":32228,"end":32288},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32288},"to":{"change":6,"start":292426,"end":292703},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292426},"to":{"change":6,"start":292426,"end":292703},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" txn_alice.write().add_file(\"file\", 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\").unwrap();\n txn_alice.add_file(\"file\").unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":33,"ins":{"up_context":[{"change":6,"pos":292722}],"down_context":[{"change":6,"pos":292782}],"flag":"BLOCK","start":21226,"end":21282,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292722},"to":{"change":6,"start":292722,"end":292782},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":35,"ins":{"up_context":[{"change":6,"pos":292844}],"down_context":[{"change":6,"pos":293050}],"flag":"BLOCK","start":21283,"end":21499,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292844},"to":{"change":6,"start":32289,"end":32345},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32345},"to":{"change":6,"start":292891,"end":292966},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292891},"to":{"change":6,"start":292891,"end":292966},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":292966},"to":{"change":6,"start":25930,"end":26015},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let mut channel_bob = txn_bob.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":39,"ins":{"up_context":[{"change":6,"pos":293092}],"down_context":[{"change":6,"pos":293115}],"flag":"BLOCK","start":21500,"end":21519,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293092},"to":{"change":6,"start":293092,"end":293115},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":41,"ins":{"up_context":[{"change":6,"pos":293133}],"down_context":[{"change":6,"pos":293181}],"flag":"BLOCK","start":21520,"end":21560,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293133},"to":{"change":6,"start":293133,"end":293181},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":46,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26030}],"down_context":[{"change":6,"pos":293207}],"flag":"BLOCK","start":21561,"end":21583,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":52,"ins":{"up_context":[{"change":6,"pos":293258}],"down_context":[{"change":6,"pos":293491}],"flag":"BLOCK","start":21584,"end":21736,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293258},"to":{"change":6,"start":293258,"end":293271},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293271},"to":{"change":6,"start":1786,"end":1844},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1844},"to":{"change":6,"start":293305,"end":293491},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293305},"to":{"change":6,"start":293305,"end":293491},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob\n"},{"Del":" .write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })\n .unwrap();\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":56,"ins":{"up_context":[{"change":6,"pos":13476}],"down_context":[{"change":6,"pos":13580}],"flag":"BLOCK","start":21737,"end":21808,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":13476},"to":{"change":6,"start":1845,"end":1903},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1903},"to":{"change":6,"start":13510,"end":13580},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":13510},"to":{"change":6,"start":13510,"end":13580},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(bob2)"}],"del_contents":[{"Del":" .write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob2).unwrap();\n Ok(())\n })\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":60,"ins":{"up_context":[{"change":6,"pos":13599}],"down_context":[{"change":6,"pos":13750}],"flag":"BLOCK","start":21809,"end":21896,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":13599},"to":{"change":6,"start":13599,"end":13698},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":13698},"to":{"change":6,"start":7060,"end":7121},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let bob_h2 = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_h2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":64,"ins":{"up_context":[{"change":6,"pos":293556}],"down_context":[{"change":6,"pos":293683}],"flag":"BLOCK","start":21897,"end":22034,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293556},"to":{"change":6,"start":1904,"end":1972},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1972},"to":{"change":6,"start":293600,"end":293683},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293600},"to":{"change":6,"start":293600,"end":293683},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice.as_bytes())"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice.as_bytes()).unwrap();\n Ok(())\n })?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":72,"ins":{"up_context":[{"change":6,"pos":293743}],"down_context":[{"change":6,"pos":293944}],"flag":"BLOCK","start":22035,"end":22121,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293743},"to":{"change":6,"start":293743,"end":293888},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":293888},"to":{"change":6,"start":7122,"end":7189},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":76,"ins":{"up_context":[{"change":6,"pos":294016}],"down_context":[{"change":6,"pos":13891}],"flag":"BLOCK","start":22122,"end":22275,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294016},"to":{"change":6,"start":26031,"end":26192},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h2)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h2)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":80,"ins":{"up_context":[{"change":6,"pos":294137}],"down_context":[{"change":6,"pos":294162}],"flag":"BLOCK","start":22276,"end":22297,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294137},"to":{"change":6,"start":294137,"end":294162},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":82,"ins":{"up_context":[{"change":6,"pos":294180}],"down_context":[{"change":6,"pos":294232}],"flag":"BLOCK","start":22298,"end":22342,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294180},"to":{"change":6,"start":294180,"end":294232},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":87,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26207}],"down_context":[{"change":6,"pos":294258}],"flag":"BLOCK","start":22343,"end":22365,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":90,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294266},"to":{"change":6,"start":7190,"end":7263},"introduced_by":6}],"inode":{"change":6,"pos":291589}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":91,"ins":{"up_context":[{"change":6,"pos":13999}],"down_context":[{"change":6,"pos":14172}],"flag":"BLOCK","start":22366,"end":22602,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":13999},"to":{"change":6,"start":13999,"end":14172},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" crate::unrecord::unrecord("},{"Add":" &mut *txn_alice.write(),"},{"Add":" &channel_alice,"},{"Add":" &changes,"},{"Add":" &bob_h2,"},{"Add":" 0,"},{"Add":" )?;"},{"Add":" crate::unrecord::unrecord(&mut *txn_alice.write(), &channel_alice, &changes, &bob_h, 0)?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut txn_alice, &mut channel_alice, &changes, &bob_h2)?;\n crate::unrecord::unrecord(&mut txn_alice, &mut channel_alice, &changes, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":100,"ins":{"up_context":[{"change":6,"pos":14173}],"down_context":[{"change":6,"pos":14402}],"flag":"BLOCK","start":22603,"end":22756,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14173},"to":{"change":6,"start":7264,"end":7343},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7343},"to":{"change":6,"start":26208,"end":26369},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h2)?;"}],"del_contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1_unrec\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h2)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":110,"ins":{"up_context":[{"change":6,"pos":294504}],"down_context":[{"change":6,"pos":294603}],"flag":"BLOCK","start":22757,"end":22860,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294504},"to":{"change":6,"start":4121,"end":4360},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\ny\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\""}],"del_contents":[{"Del":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\ny\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":117,"ins":{"up_context":[{"change":6,"pos":294725}],"down_context":[{"change":6,"pos":294822}],"flag":"BLOCK","start":22861,"end":22992,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294725},"to":{"change":6,"start":4361,"end":4598},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" Ok("},{"Add":" &\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\ny\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..]"},{"Add":" )"}],"del_contents":[{"Del":" Ok(&\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\ny\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..])\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":125,"ins":{"up_context":[{"change":6,"pos":294971}],"down_context":[{"change":6,"pos":295011}],"flag":"BLOCK","start":22993,"end":23059,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":294971},"to":{"change":6,"start":1973,"end":2037},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":130,"ins":{"up_context":[{"change":6,"pos":295115}],"down_context":[{"change":6,"pos":295139}],"flag":"BLOCK","start":23060,"end":23066,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295115},"to":{"change":6,"start":295115,"end":295139},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":132,"ins":{"up_context":[{"change":6,"pos":295175}],"down_context":[{"change":6,"pos":295388}],"flag":"BLOCK","start":23067,"end":23159,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295175},"to":{"change":6,"start":295175,"end":295326},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295326},"to":{"change":6,"start":7344,"end":7417},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let _fix_deletion = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let _fix_deletion = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":137,"ins":{"up_context":[{"change":6,"pos":295496}],"down_context":[{"change":6,"pos":295693}],"flag":"BLOCK","start":23160,"end":23242,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295496},"to":{"change":6,"start":7418,"end":7485},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7485},"to":{"change":6,"start":26370,"end":26456},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":26456},"to":{"change":6,"start":7486,"end":7553},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295637},"to":{"change":6,"start":7486,"end":7553},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h).unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":140,"ins":{"up_context":[{"change":6,"pos":2039}],"down_context":[{"change":6,"pos":2123}],"flag":"BLOCK","start":23243,"end":23386,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2039},"to":{"change":6,"start":2039,"end":2123},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" crate::unrecord::unrecord("},{"Add":" &mut *txn_bob.write(),"},{"Add":" &mut channel_bob,"},{"Add":" &changes,"},{"Add":" &alice_h,"},{"Add":" 0,"},{"Add":" )?;"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut txn_bob, &mut channel_bob, &changes, &alice_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":148,"ins":{"up_context":[{"change":6,"pos":2124}],"down_context":[{"change":6,"pos":2265}],"flag":"BLOCK","start":23387,"end":23461,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2124},"to":{"change":6,"start":7554,"end":7627},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":7627},"to":{"change":6,"start":26457,"end":26535},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2_unrec\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":150,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2266},"to":{"change":6,"start":7628,"end":7705},"introduced_by":6}],"inode":{"change":6,"pos":291589}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2_unrec_app\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":153,"ins":{"up_context":[{"change":6,"pos":295779}],"down_context":[{"change":6,"pos":295802}],"flag":"BLOCK","start":23462,"end":23481,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295779},"to":{"change":6,"start":295779,"end":295802},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":155,"ins":{"up_context":[{"change":6,"pos":295820}],"down_context":[{"change":6,"pos":295868}],"flag":"BLOCK","start":23482,"end":23522,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295820},"to":{"change":6,"start":295820,"end":295868},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":160,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26550}],"down_context":[{"change":6,"pos":295894}],"flag":"BLOCK","start":23523,"end":23545,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":163,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":295902},"to":{"change":6,"start":7706,"end":7773},"introduced_by":6}],"inode":{"change":6,"pos":291589}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":181,"ins":{"up_context":[{"change":6,"pos":296530}],"down_context":[{"change":6,"pos":296568}],"flag":"BLOCK","start":23546,"end":23610,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":296530},"to":{"change":6,"start":2366,"end":2428},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_bob.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":186,"ins":{"up_context":[{"change":6,"pos":296672}],"down_context":[{"change":6,"pos":296696}],"flag":"BLOCK","start":23611,"end":23617,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":296672},"to":{"change":6,"start":296672,"end":296696},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":188,"ins":{"up_context":[{"change":6,"pos":296733}],"down_context":[{"change":6,"pos":296832}],"flag":"BLOCK","start":23618,"end":23705,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":296733},"to":{"change":6,"start":296733,"end":296832},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let _fix_insertion = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let _fix_insertion = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":201,"ins":{"up_context":[{"change":6,"pos":297095}],"down_context":[{"change":6,"pos":297157}],"flag":"BLOCK","start":23706,"end":23764,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297095},"to":{"change":6,"start":297095,"end":297157},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":206,"ins":{"up_context":[{"change":6,"pos":297328}],"down_context":[{"change":6,"pos":297713}],"flag":"BLOCK","start":23765,"end":24025,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297328},"to":{"change":6,"start":32346,"end":32406},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32406},"to":{"change":6,"start":297379,"end":297627},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297379},"to":{"change":6,"start":297379,"end":297627},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297627},"to":{"change":6,"start":7774,"end":7853},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"main\")?;"},{"Add":" txn_alice.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;\n txn_alice.add_file(\"file\")?;\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":212,"ins":{"up_context":[{"change":6,"pos":297732}],"down_context":[{"change":6,"pos":297792}],"flag":"BLOCK","start":24026,"end":24082,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297732},"to":{"change":6,"start":297732,"end":297792},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":214,"ins":{"up_context":[{"change":6,"pos":297854}],"down_context":[{"change":6,"pos":298044}],"flag":"BLOCK","start":24083,"end":24279,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297854},"to":{"change":6,"start":32407,"end":32463},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32463},"to":{"change":6,"start":297901,"end":297968},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297901},"to":{"change":6,"start":297901,"end":297968},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":297968},"to":{"change":6,"start":26551,"end":26628},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"main\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":218,"ins":{"up_context":[{"change":6,"pos":298086}],"down_context":[{"change":6,"pos":298109}],"flag":"BLOCK","start":24280,"end":24299,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298086},"to":{"change":6,"start":298086,"end":298109},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":220,"ins":{"up_context":[{"change":6,"pos":298127}],"down_context":[{"change":6,"pos":298175}],"flag":"BLOCK","start":24300,"end":24340,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298127},"to":{"change":6,"start":298127,"end":298175},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":225,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26643}],"down_context":[{"change":6,"pos":298201}],"flag":"BLOCK","start":24341,"end":24363,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":236,"ins":{"up_context":[{"change":6,"pos":298481}],"down_context":[{"change":6,"pos":298732}],"flag":"BLOCK","start":24364,"end":24508,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298481},"to":{"change":6,"start":2429,"end":2491},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2491},"to":{"change":6,"start":298519,"end":298668},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298519},"to":{"change":6,"start":298519,"end":298668},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298668},"to":{"change":6,"start":7854,"end":7929},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":241,"ins":{"up_context":[{"change":6,"pos":298803}],"down_context":[{"change":6,"pos":299138}],"flag":"BLOCK","start":24509,"end":24702,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298803},"to":{"change":6,"start":2492,"end":2556},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2556},"to":{"change":6,"start":298843,"end":299050},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":298843},"to":{"change":6,"start":298843,"end":299050},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":299050},"to":{"change":6,"start":7930,"end":8011},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let _alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let _alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":250,"ins":{"up_context":[{"change":6,"pos":299215}],"down_context":[{"change":6,"pos":299294}],"flag":"BLOCK","start":24703,"end":24779,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":299215},"to":{"change":6,"start":26644,"end":26724},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":252,"ins":{"up_context":[{"change":6,"pos":299336}],"down_context":[{"change":6,"pos":299361}],"flag":"BLOCK","start":24780,"end":24801,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":299336},"to":{"change":6,"start":299336,"end":299361},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":254,"ins":{"up_context":[{"change":6,"pos":299379}],"down_context":[{"change":6,"pos":299431}],"flag":"BLOCK","start":24802,"end":24846,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":299379},"to":{"change":6,"start":299379,"end":299431},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":259,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26739}],"down_context":[{"change":6,"pos":299457}],"flag":"BLOCK","start":24847,"end":24869,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":262,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":299465},"to":{"change":6,"start":8012,"end":8093},"introduced_by":6}],"inode":{"change":6,"pos":291589}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":279,"ins":{"up_context":[{"change":6,"pos":300061}],"down_context":[{"change":6,"pos":300140}],"flag":"BLOCK","start":24870,"end":24946,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":300061},"to":{"change":6,"start":26740,"end":26820},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &inv_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &inv_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":281,"ins":{"up_context":[{"change":6,"pos":300182}],"down_context":[{"change":6,"pos":300207}],"flag":"BLOCK","start":24947,"end":24968,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":300182},"to":{"change":6,"start":300182,"end":300207},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":283,"ins":{"up_context":[{"change":6,"pos":300225}],"down_context":[{"change":6,"pos":300277}],"flag":"BLOCK","start":24969,"end":25013,"inode":{"change":6,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":300225},"to":{"change":6,"start":300225,"end":300277},"introduced_by":6}],"inode":{"change":6,"pos":291589}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":288,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26835}],"down_context":[{"change":6,"pos":300303}],"flag":"BLOCK","start":25014,"end":25036,"inode":{"change":6,"pos":291589}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":291,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":300311},"to":{"change":6,"start":8094,"end":8175},"introduced_by":6}],"inode":{"change":6,"pos":291589}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":300445}],"down_context":[{"change":6,"pos":300445}],"flag":"BLOCK","start":25037,"end":25057,"inode":{"change":6,"pos":300430}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":9,"ins":{"up_context":[{"change":6,"pos":300578}],"down_context":[{"change":6,"pos":300656}],"flag":"BLOCK","start":25058,"end":25132,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":300578},"to":{"change":6,"start":300578,"end":300656},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let repo = working_copy::filesystem::FileSystem::from_root(r.path());"}],"del_contents":[{"Del":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":14,"ins":{"up_context":[{"change":6,"pos":300768}],"down_context":[{"change":6,"pos":300852}],"flag":"BLOCK","start":25133,"end":25249,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":300768},"to":{"change":6,"start":2557,"end":2681},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" repo.write_file(\"dir/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |f| {\n Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?)\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":21,"ins":{"up_context":[{"change":6,"pos":26914}],"down_context":[{"change":6,"pos":301066}],"flag":"BLOCK","start":25250,"end":25344,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26914},"to":{"change":6,"start":32464,"end":32512},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32512},"to":{"change":6,"start":301027,"end":301066},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":301027},"to":{"change":6,"start":301027,"end":301066},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0).unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" txn.add_file(\"dir/file\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":24,"ins":{"up_context":[{"change":6,"pos":301067}],"down_context":[{"change":6,"pos":301284}],"flag":"BLOCK","start":25345,"end":25558,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":301067},"to":{"change":6,"start":301067,"end":301284},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main2\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n let mut channel = txn.open_or_create_channel(\"main2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":28,"ins":{"up_context":[{"change":6,"pos":301307}],"down_context":[{"change":6,"pos":301485}],"flag":"BLOCK","start":25559,"end":25734,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":301307},"to":{"change":6,"start":26915,"end":26979},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26979},"to":{"change":6,"start":4182,"end":4362},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &p)?;"},{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;\n"},{"Del":" output::output_repository_no_pending(\n &mut repo,\n &changes,\n &mut txn,\n &mut channel,\n \"\",\n true,\n None,\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":45,"ins":{"up_context":[{"change":6,"pos":301772}],"down_context":[{"change":6,"pos":301850}],"flag":"BLOCK","start":25735,"end":25809,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":301772},"to":{"change":6,"start":301772,"end":301850},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let repo = working_copy::filesystem::FileSystem::from_root(r.path());"}],"del_contents":[{"Del":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":50,"ins":{"up_context":[{"change":6,"pos":301962}],"down_context":[{"change":6,"pos":302046}],"flag":"BLOCK","start":25810,"end":25926,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":301962},"to":{"change":6,"start":2682,"end":2806},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" repo.write_file(\"dir/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |f| {\n Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?)\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":59,"ins":{"up_context":[{"change":6,"pos":27160}],"down_context":[{"change":6,"pos":302396}],"flag":"BLOCK","start":25927,"end":26071,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27160},"to":{"change":6,"start":32513,"end":32561},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32561},"to":{"change":6,"start":302318,"end":302396},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":302318},"to":{"change":6,"start":302318,"end":302396},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0).unwrap();"},{"Add":" txn.write().add_file(\"dir/link\", 0).unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" txn.add_file(\"dir/file\").unwrap();\n txn.add_file(\"dir/link\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":63,"ins":{"up_context":[{"change":6,"pos":302397}],"down_context":[{"change":6,"pos":302546}],"flag":"BLOCK","start":26072,"end":26213,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":302397},"to":{"change":6,"start":302397,"end":302546},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":66,"ins":{"up_context":[{"change":6,"pos":302569}],"down_context":[{"change":6,"pos":302815}],"flag":"BLOCK","start":26214,"end":26461,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":302569},"to":{"change":6,"start":302569,"end":302637},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":302637},"to":{"change":6,"start":27161,"end":27225},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27225},"to":{"change":6,"start":4363,"end":4543},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &p)?;"},{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;\n"},{"Del":" output::output_repository_no_pending(\n &mut repo,\n &changes,\n &mut txn,\n &mut channel,\n \"\",\n true,\n None,\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":84,"ins":{"up_context":[{"change":6,"pos":303114}],"down_context":[{"change":6,"pos":303192}],"flag":"BLOCK","start":26462,"end":26536,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":303114},"to":{"change":6,"start":303114,"end":303192},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let repo = working_copy::filesystem::FileSystem::from_root(r.path());"}],"del_contents":[{"Del":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":95,"ins":{"up_context":[{"change":6,"pos":27406}],"down_context":[{"change":6,"pos":303659}],"flag":"BLOCK","start":26537,"end":26631,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27406},"to":{"change":6,"start":32562,"end":32610},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32610},"to":{"change":6,"start":303620,"end":303659},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":303620},"to":{"change":6,"start":303620,"end":303659},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/link\", 0).unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" txn.add_file(\"dir/link\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":98,"ins":{"up_context":[{"change":6,"pos":303660}],"down_context":[{"change":6,"pos":303809}],"flag":"BLOCK","start":26632,"end":26773,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":303660},"to":{"change":6,"start":303660,"end":303809},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":101,"ins":{"up_context":[{"change":6,"pos":303832}],"down_context":[{"change":6,"pos":304078}],"flag":"BLOCK","start":26774,"end":27021,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":303832},"to":{"change":6,"start":303832,"end":303900},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":303900},"to":{"change":6,"start":27407,"end":27471},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27471},"to":{"change":6,"start":4544,"end":4724},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &p)?;"},{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;\n"},{"Del":" output::output_repository_no_pending(\n &mut repo,\n &changes,\n &mut txn,\n &mut channel,\n \"\",\n true,\n None,\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":115,"ins":{"up_context":[{"change":6,"pos":304264}],"down_context":[{"change":6,"pos":304342}],"flag":"BLOCK","start":27022,"end":27096,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":304264},"to":{"change":6,"start":304264,"end":304342},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let repo = working_copy::filesystem::FileSystem::from_root(r.path());"}],"del_contents":[{"Del":" let mut repo = working_copy::filesystem::FileSystem::from_root(r.path());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":120,"ins":{"up_context":[{"change":6,"pos":304454}],"down_context":[{"change":6,"pos":304538}],"flag":"BLOCK","start":27097,"end":27213,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":304454},"to":{"change":6,"start":2807,"end":2931},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" repo.write_file(\"dir/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"dir/file\", |f| {\n Ok(f.write_all(&b\"a\\nb\\nc\\nd\\ne\\nf\\n\"[..])?)\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":128,"ins":{"up_context":[{"change":6,"pos":27652}],"down_context":[{"change":6,"pos":304752}],"flag":"BLOCK","start":27214,"end":27308,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27652},"to":{"change":6,"start":32611,"end":32659},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32659},"to":{"change":6,"start":304713,"end":304752},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":304713},"to":{"change":6,"start":304713,"end":304752},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0).unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" txn.add_file(\"dir/file\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":131,"ins":{"up_context":[{"change":6,"pos":304753}],"down_context":[{"change":6,"pos":304902}],"flag":"BLOCK","start":27309,"end":27450,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":304753},"to":{"change":6,"start":304753,"end":304902},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" let p = record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n let p = record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":134,"ins":{"up_context":[{"change":6,"pos":304925}],"down_context":[{"change":6,"pos":304993}],"flag":"BLOCK","start":27451,"end":27523,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":304925},"to":{"change":6,"start":304925,"end":304993},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main2\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":300430},"path":"libpijul/src/tests/filesystem.rs","line":141,"ins":{"up_context":[{"change":6,"pos":305266}],"down_context":[{"change":6,"pos":305444}],"flag":"BLOCK","start":27524,"end":27699,"inode":{"change":6,"pos":300430}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":305266},"to":{"change":6,"start":27653,"end":27717},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27717},"to":{"change":6,"start":4725,"end":4905},"introduced_by":6}],"inode":{"change":6,"pos":300430}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel, &p)?;"},{"Add":" output::output_repository_no_pending(&repo, &changes, &txn, &channel, \"\", true, None, 1, 0)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel, &p)?;\n"},{"Del":" output::output_repository_no_pending(\n &mut repo,\n &changes,\n &mut txn,\n &mut channel,\n \"\",\n true,\n None,\n )\n .unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":305521},"to":{"change":6,"start":305521,"end":305522},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":305560}],"down_context":[{"change":6,"pos":305560}],"flag":"BLOCK","start":27700,"end":27720,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":22,"ins":{"up_context":[{"change":6,"pos":305985}],"down_context":[{"change":6,"pos":306107}],"flag":"BLOCK","start":27721,"end":27835,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":305985},"to":{"change":6,"start":305985,"end":306107},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":28,"ins":{"up_context":[{"change":6,"pos":306276}],"down_context":[{"change":6,"pos":306327}],"flag":"BLOCK","start":27836,"end":27892,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306276},"to":{"change":6,"start":32660,"end":32720},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":30,"ins":{"up_context":[{"change":6,"pos":306389}],"down_context":[{"change":6,"pos":306436}],"flag":"BLOCK","start":27893,"end":27945,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306389},"to":{"change":6,"start":32721,"end":32777},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":32,"ins":{"up_context":[{"change":6,"pos":306437}],"down_context":[{"change":6,"pos":306517}],"flag":"BLOCK","start":27946,"end":28030,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306437},"to":{"change":6,"start":306437,"end":306517},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":34,"ins":{"up_context":[{"change":6,"pos":306518}],"down_context":[{"change":6,"pos":306763}],"flag":"BLOCK","start":28031,"end":28166,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306518},"to":{"change":6,"start":306518,"end":306701},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306701},"to":{"change":6,"start":8176,"end":8249},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(file, 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(file).unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":38,"ins":{"up_context":[{"change":6,"pos":306782}],"down_context":[{"change":6,"pos":306940}],"flag":"BLOCK","start":28167,"end":28326,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306782},"to":{"change":6,"start":306782,"end":306856},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306856},"to":{"change":6,"start":27820,"end":27905},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":41,"ins":{"up_context":[{"change":6,"pos":306982}],"down_context":[{"change":6,"pos":307005}],"flag":"BLOCK","start":28327,"end":28346,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":306982},"to":{"change":6,"start":306982,"end":307005},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":43,"ins":{"up_context":[{"change":6,"pos":307023}],"down_context":[{"change":6,"pos":307071}],"flag":"BLOCK","start":28347,"end":28387,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307023},"to":{"change":6,"start":307023,"end":307071},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":48,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":27920}],"down_context":[{"change":6,"pos":307097}],"flag":"BLOCK","start":28388,"end":28410,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":51,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307105},"to":{"change":6,"start":8250,"end":8317},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":54,"ins":{"up_context":[{"change":6,"pos":307238}],"down_context":[{"change":6,"pos":307277}],"flag":"BLOCK","start":28411,"end":28461,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307238},"to":{"change":6,"start":307238,"end":307277},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().move_file(file, alice, 0)?;"}],"del_contents":[{"Del":" txn_alice.move_file(file, alice)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":56,"ins":{"up_context":[{"change":6,"pos":307333}],"down_context":[{"change":6,"pos":307553}],"flag":"BLOCK","start":28462,"end":28556,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307333},"to":{"change":6,"start":307333,"end":307491},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307491},"to":{"change":6,"start":8318,"end":8391},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":60,"ins":{"up_context":[{"change":6,"pos":307622}],"down_context":[{"change":6,"pos":307657}],"flag":"BLOCK","start":28557,"end":28603,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307622},"to":{"change":6,"start":307622,"end":307657},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_bob.write().move_file(file, bob, 0)?;"}],"del_contents":[{"Del":" txn_bob.move_file(file, bob)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":62,"ins":{"up_context":[{"change":6,"pos":307711}],"down_context":[{"change":6,"pos":307865}],"flag":"BLOCK","start":28604,"end":28690,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307711},"to":{"change":6,"start":307711,"end":307809},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307809},"to":{"change":6,"start":8392,"end":8459},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":65,"ins":{"up_context":[{"change":6,"pos":307900}],"down_context":[{"change":6,"pos":308041}],"flag":"BLOCK","start":28691,"end":28767,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307900},"to":{"change":6,"start":27921,"end":28001},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28001},"to":{"change":6,"start":8460,"end":8533},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":307979},"to":{"change":6,"start":8460,"end":8533},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":67,"ins":{"up_context":[{"change":6,"pos":308099}],"down_context":[{"change":6,"pos":308124}],"flag":"BLOCK","start":28768,"end":28789,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308099},"to":{"change":6,"start":308099,"end":308124},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":69,"ins":{"up_context":[{"change":6,"pos":308142}],"down_context":[{"change":6,"pos":308194}],"flag":"BLOCK","start":28790,"end":28834,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308142},"to":{"change":6,"start":308142,"end":308194},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":74,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28016}],"down_context":[{"change":6,"pos":308220}],"flag":"BLOCK","start":28835,"end":28857,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":83,"ins":{"up_context":[{"change":6,"pos":308376}],"down_context":[{"change":6,"pos":308509}],"flag":"BLOCK","start":28858,"end":28932,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308376},"to":{"change":6,"start":28017,"end":28095},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28095},"to":{"change":6,"start":8534,"end":8601},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308453},"to":{"change":6,"start":8534,"end":8601},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":85,"ins":{"up_context":[{"change":6,"pos":308567}],"down_context":[{"change":6,"pos":308590}],"flag":"BLOCK","start":28933,"end":28952,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308567},"to":{"change":6,"start":308567,"end":308590},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":87,"ins":{"up_context":[{"change":6,"pos":308608}],"down_context":[{"change":6,"pos":308656}],"flag":"BLOCK","start":28953,"end":28993,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308608},"to":{"change":6,"start":308608,"end":308656},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":92,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28110}],"down_context":[{"change":6,"pos":308685}],"flag":"BLOCK","start":28994,"end":29016,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":99,"ins":{"up_context":[{"change":6,"pos":308836}],"down_context":[{"change":6,"pos":308859}],"flag":"BLOCK","start":29017,"end":29036,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308836},"to":{"change":6,"start":308836,"end":308859},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":101,"ins":{"up_context":[{"change":6,"pos":308877}],"down_context":[{"change":6,"pos":308925}],"flag":"BLOCK","start":29037,"end":29077,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308877},"to":{"change":6,"start":308877,"end":308925},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":106,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28125}],"down_context":[{"change":6,"pos":308952}],"flag":"BLOCK","start":29078,"end":29100,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":114,"ins":{"up_context":[{"change":6,"pos":309104}],"down_context":[{"change":6,"pos":309127}],"flag":"BLOCK","start":29101,"end":29120,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309104},"to":{"change":6,"start":309104,"end":309127},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":116,"ins":{"up_context":[{"change":6,"pos":309145}],"down_context":[{"change":6,"pos":309193}],"flag":"BLOCK","start":29121,"end":29161,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309145},"to":{"change":6,"start":309145,"end":309193},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":121,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28140}],"down_context":[{"change":6,"pos":309219}],"flag":"BLOCK","start":29162,"end":29184,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":130,"ins":{"up_context":[{"change":6,"pos":309360}],"down_context":[{"change":6,"pos":309473}],"flag":"BLOCK","start":29185,"end":29278,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309360},"to":{"change":6,"start":309360,"end":309473},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_solution = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_solution =\n record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":132,"ins":{"up_context":[{"change":6,"pos":309531}],"down_context":[{"change":6,"pos":309554}],"flag":"BLOCK","start":29279,"end":29298,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309531},"to":{"change":6,"start":309531,"end":309554},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":134,"ins":{"up_context":[{"change":6,"pos":309572}],"down_context":[{"change":6,"pos":309620}],"flag":"BLOCK","start":29299,"end":29339,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309572},"to":{"change":6,"start":309572,"end":309620},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":139,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28155}],"down_context":[{"change":6,"pos":309646}],"flag":"BLOCK","start":29340,"end":29362,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":147,"ins":{"up_context":[{"change":6,"pos":309777}],"down_context":[{"change":6,"pos":309863}],"flag":"BLOCK","start":29363,"end":29446,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309777},"to":{"change":6,"start":28156,"end":28243},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_solution)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":149,"ins":{"up_context":[{"change":6,"pos":309921}],"down_context":[{"change":6,"pos":309946}],"flag":"BLOCK","start":29447,"end":29468,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309921},"to":{"change":6,"start":309921,"end":309946},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":151,"ins":{"up_context":[{"change":6,"pos":309964}],"down_context":[{"change":6,"pos":310016}],"flag":"BLOCK","start":29469,"end":29513,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":309964},"to":{"change":6,"start":309964,"end":310016},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":156,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28258}],"down_context":[{"change":6,"pos":310042}],"flag":"BLOCK","start":29514,"end":29536,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":165,"ins":{"up_context":[{"change":6,"pos":310248}],"down_context":[{"change":6,"pos":310287}],"flag":"BLOCK","start":29537,"end":29586,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":310248},"to":{"change":6,"start":16291,"end":16332},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" debug_tree(&*txn_bob.read(), \"debug_tree\")?;"}],"del_contents":[{"Del":" debug_tree(&txn_bob, \"debug_tree\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":176,"ins":{"up_context":[{"change":6,"pos":310507}],"down_context":[{"change":6,"pos":310629}],"flag":"BLOCK","start":29587,"end":29701,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":310507},"to":{"change":6,"start":310507,"end":310629},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":183,"ins":{"up_context":[{"change":6,"pos":310854}],"down_context":[{"change":6,"pos":310905}],"flag":"BLOCK","start":29702,"end":29758,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":310854},"to":{"change":6,"start":32778,"end":32838},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":185,"ins":{"up_context":[{"change":6,"pos":310967}],"down_context":[{"change":6,"pos":311014}],"flag":"BLOCK","start":29759,"end":29811,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":310967},"to":{"change":6,"start":32839,"end":32895},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":187,"ins":{"up_context":[{"change":6,"pos":311015}],"down_context":[{"change":6,"pos":311087}],"flag":"BLOCK","start":29812,"end":29888,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311015},"to":{"change":6,"start":311015,"end":311087},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\")?;"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":189,"ins":{"up_context":[{"change":6,"pos":311088}],"down_context":[{"change":6,"pos":311156}],"flag":"BLOCK","start":29889,"end":29979,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311088},"to":{"change":6,"start":311088,"end":311156},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file1\", 0)?;"},{"Add":" txn_alice.write().add_file(\"file2\", 0)?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"file1\")?;\n txn_alice.add_file(\"file2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":193,"ins":{"up_context":[{"change":6,"pos":311242}],"down_context":[{"change":6,"pos":311489}],"flag":"BLOCK","start":29980,"end":30116,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311242},"to":{"change":6,"start":16333,"end":16376},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16376},"to":{"change":6,"start":311283,"end":311427},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311283},"to":{"change":6,"start":311283,"end":311427},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311427},"to":{"change":6,"start":8602,"end":8675},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" debug_tree(&*txn_alice.read(), \"debug_tree\")?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" debug_tree(&txn_alice, \"debug_tree\")?;\n"},{"Del":" let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":197,"ins":{"up_context":[{"change":6,"pos":311508}],"down_context":[{"change":6,"pos":311666}],"flag":"BLOCK","start":30117,"end":30276,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311508},"to":{"change":6,"start":311508,"end":311582},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311582},"to":{"change":6,"start":28259,"end":28344},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":200,"ins":{"up_context":[{"change":6,"pos":311708}],"down_context":[{"change":6,"pos":311731}],"flag":"BLOCK","start":30277,"end":30296,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311708},"to":{"change":6,"start":311708,"end":311731},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":202,"ins":{"up_context":[{"change":6,"pos":311749}],"down_context":[{"change":6,"pos":311797}],"flag":"BLOCK","start":30297,"end":30337,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311749},"to":{"change":6,"start":311749,"end":311797},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":207,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28359}],"down_context":[{"change":6,"pos":311823}],"flag":"BLOCK","start":30338,"end":30360,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":210,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311831},"to":{"change":6,"start":8676,"end":8743},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":213,"ins":{"up_context":[{"change":6,"pos":311968}],"down_context":[{"change":6,"pos":312011}],"flag":"BLOCK","start":30361,"end":30415,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":311968},"to":{"change":6,"start":311968,"end":312011},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"file1\", \"file\", 0)?;"}],"del_contents":[{"Del":" txn_alice.move_file(\"file1\", \"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":216,"ins":{"up_context":[{"change":6,"pos":312068}],"down_context":[{"change":6,"pos":312288}],"flag":"BLOCK","start":30416,"end":30510,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312068},"to":{"change":6,"start":312068,"end":312226},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312226},"to":{"change":6,"start":8744,"end":8817},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":220,"ins":{"up_context":[{"change":6,"pos":312365}],"down_context":[{"change":6,"pos":312406}],"flag":"BLOCK","start":30511,"end":30563,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312365},"to":{"change":6,"start":312365,"end":312406},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_bob.write().move_file(\"file2\", \"file\", 0)?;"}],"del_contents":[{"Del":" txn_bob.move_file(\"file2\", \"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":222,"ins":{"up_context":[{"change":6,"pos":312460}],"down_context":[{"change":6,"pos":312614}],"flag":"BLOCK","start":30564,"end":30650,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312460},"to":{"change":6,"start":312460,"end":312558},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312558},"to":{"change":6,"start":8818,"end":8885},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":225,"ins":{"up_context":[{"change":6,"pos":312649}],"down_context":[{"change":6,"pos":312790}],"flag":"BLOCK","start":30651,"end":30727,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312649},"to":{"change":6,"start":28360,"end":28440},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28440},"to":{"change":6,"start":8886,"end":8959},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312728},"to":{"change":6,"start":8886,"end":8959},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":227,"ins":{"up_context":[{"change":6,"pos":312832}],"down_context":[{"change":6,"pos":312857}],"flag":"BLOCK","start":30728,"end":30749,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312832},"to":{"change":6,"start":312832,"end":312857},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":229,"ins":{"up_context":[{"change":6,"pos":312875}],"down_context":[{"change":6,"pos":312927}],"flag":"BLOCK","start":30750,"end":30794,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312875},"to":{"change":6,"start":312875,"end":312927},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":234,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28455}],"down_context":[{"change":6,"pos":312953}],"flag":"BLOCK","start":30795,"end":30817,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":239,"ins":{"up_context":[{"change":6,"pos":312996}],"down_context":[{"change":6,"pos":313129}],"flag":"BLOCK","start":30818,"end":30892,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":312996},"to":{"change":6,"start":28456,"end":28534},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28534},"to":{"change":6,"start":8960,"end":9027},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":313073},"to":{"change":6,"start":8960,"end":9027},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":241,"ins":{"up_context":[{"change":6,"pos":313187}],"down_context":[{"change":6,"pos":313210}],"flag":"BLOCK","start":30893,"end":30912,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":313187},"to":{"change":6,"start":313187,"end":313210},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":243,"ins":{"up_context":[{"change":6,"pos":313228}],"down_context":[{"change":6,"pos":313276}],"flag":"BLOCK","start":30913,"end":30953,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":313228},"to":{"change":6,"start":313228,"end":313276},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":248,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28549}],"down_context":[{"change":6,"pos":313302}],"flag":"BLOCK","start":30954,"end":30976,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":262,"ins":{"up_context":[{"change":6,"pos":313622}],"down_context":[{"change":6,"pos":313671}],"flag":"BLOCK","start":30977,"end":31037,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":313622},"to":{"change":6,"start":313622,"end":313671},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().move_file(&files_alice[1], \"a1\", 0)?;"}],"del_contents":[{"Del":" txn_alice.move_file(&files_alice[1], \"a1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":265,"ins":{"up_context":[{"change":6,"pos":313767}],"down_context":[{"change":6,"pos":313932}],"flag":"BLOCK","start":31038,"end":31139,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":313767},"to":{"change":6,"start":313767,"end":313932},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let solution_alice = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let solution_alice = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":275,"ins":{"up_context":[{"change":6,"pos":314246}],"down_context":[{"change":6,"pos":314330}],"flag":"BLOCK","start":31140,"end":31221,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":314246},"to":{"change":6,"start":28550,"end":28635},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &solution_alice)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &solution_alice)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":277,"ins":{"up_context":[{"change":6,"pos":314388}],"down_context":[{"change":6,"pos":314411}],"flag":"BLOCK","start":31222,"end":31241,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":314388},"to":{"change":6,"start":314388,"end":314411},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":279,"ins":{"up_context":[{"change":6,"pos":314429}],"down_context":[{"change":6,"pos":314477}],"flag":"BLOCK","start":31242,"end":31282,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":314429},"to":{"change":6,"start":314429,"end":314477},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":284,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28650}],"down_context":[{"change":6,"pos":314503}],"flag":"BLOCK","start":31283,"end":31305,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":290,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":314596},"to":{"change":6,"start":9028,"end":9095},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":302,"ins":{"up_context":[{"change":6,"pos":314951}],"down_context":[{"change":6,"pos":315013}],"flag":"BLOCK","start":31306,"end":31364,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":314951},"to":{"change":6,"start":314951,"end":315013},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":304,"ins":{"up_context":[{"change":6,"pos":315073}],"down_context":[{"change":6,"pos":315137}],"flag":"BLOCK","start":31365,"end":31425,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315073},"to":{"change":6,"start":315073,"end":315137},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_charlie = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_charlie = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":310,"ins":{"up_context":[{"change":6,"pos":315362}],"down_context":[{"change":6,"pos":315413}],"flag":"BLOCK","start":31426,"end":31482,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315362},"to":{"change":6,"start":32896,"end":32956},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":312,"ins":{"up_context":[{"change":6,"pos":315475}],"down_context":[{"change":6,"pos":315522}],"flag":"BLOCK","start":31483,"end":31539,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315475},"to":{"change":6,"start":32957,"end":33013},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":314,"ins":{"up_context":[{"change":6,"pos":315523}],"down_context":[{"change":6,"pos":315595}],"flag":"BLOCK","start":31540,"end":31616,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315523},"to":{"change":6,"start":315523,"end":315595},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\")?;"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":316,"ins":{"up_context":[{"change":6,"pos":315596}],"down_context":[{"change":6,"pos":315664}],"flag":"BLOCK","start":31617,"end":31707,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315596},"to":{"change":6,"start":315596,"end":315664},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file1\", 0)?;"},{"Add":" txn_alice.write().add_file(\"file2\", 0)?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"file1\")?;\n txn_alice.add_file(\"file2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":320,"ins":{"up_context":[{"change":6,"pos":315750}],"down_context":[{"change":6,"pos":315997}],"flag":"BLOCK","start":31708,"end":31844,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315750},"to":{"change":6,"start":16808,"end":16851},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16851},"to":{"change":6,"start":315791,"end":315935},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315791},"to":{"change":6,"start":315791,"end":315935},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":315935},"to":{"change":6,"start":9096,"end":9169},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" debug_tree(&*txn_alice.read(), \"debug_tree\")?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" debug_tree(&txn_alice, \"debug_tree\")?;\n"},{"Del":" let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":324,"ins":{"up_context":[{"change":6,"pos":316046}],"down_context":[{"change":6,"pos":316204}],"flag":"BLOCK","start":31845,"end":32008,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316046},"to":{"change":6,"start":316046,"end":316120},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316120},"to":{"change":6,"start":28651,"end":28736},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":327,"ins":{"up_context":[{"change":6,"pos":316246}],"down_context":[{"change":6,"pos":316269}],"flag":"BLOCK","start":32009,"end":32028,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316246},"to":{"change":6,"start":316246,"end":316269},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":329,"ins":{"up_context":[{"change":6,"pos":316287}],"down_context":[{"change":6,"pos":316335}],"flag":"BLOCK","start":32029,"end":32069,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316287},"to":{"change":6,"start":316287,"end":316335},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":334,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28751}],"down_context":[{"change":6,"pos":316361}],"flag":"BLOCK","start":32070,"end":32092,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":337,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316369},"to":{"change":6,"start":9170,"end":9237},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":338,"ins":{"up_context":[{"change":6,"pos":316464}],"down_context":[{"change":6,"pos":316505}],"flag":"BLOCK","start":32093,"end":32145,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316464},"to":{"change":6,"start":316464,"end":316505},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_bob.write().move_file(\"file2\", \"file\", 0)?;"}],"del_contents":[{"Del":" txn_bob.move_file(\"file2\", \"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":340,"ins":{"up_context":[{"change":6,"pos":316559}],"down_context":[{"change":6,"pos":316713}],"flag":"BLOCK","start":32146,"end":32232,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316559},"to":{"change":6,"start":316559,"end":316657},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316657},"to":{"change":6,"start":9238,"end":9305},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":344,"ins":{"up_context":[{"change":6,"pos":316794}],"down_context":[{"change":6,"pos":316837}],"flag":"BLOCK","start":32233,"end":32287,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316794},"to":{"change":6,"start":316794,"end":316837},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"file1\", \"file\", 0)?;"}],"del_contents":[{"Del":" txn_alice.move_file(\"file1\", \"file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":347,"ins":{"up_context":[{"change":6,"pos":316894}],"down_context":[{"change":6,"pos":317114}],"flag":"BLOCK","start":32288,"end":32382,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":316894},"to":{"change":6,"start":316894,"end":317052},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317052},"to":{"change":6,"start":9306,"end":9379},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":352,"ins":{"up_context":[{"change":6,"pos":317279}],"down_context":[{"change":6,"pos":317512}],"flag":"BLOCK","start":32383,"end":32649,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317279},"to":{"change":6,"start":33014,"end":33078},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33078},"to":{"change":6,"start":317334,"end":317420},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317334},"to":{"change":6,"start":317334,"end":317420},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317420},"to":{"change":6,"start":28752,"end":28845},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_charlie = env_charlie.arc_txn_begin().unwrap();"},{"Add":" let channel_charlie = txn_charlie"},{"Add":" .write()"},{"Add":" .open_or_create_channel(\"charlie\")"},{"Add":" .unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut txn_charlie = env_charlie.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_charlie = txn_charlie.open_or_create_channel(\"charlie\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":359,"ins":{"up_context":[{"change":6,"pos":317554}],"down_context":[{"change":6,"pos":317581}],"flag":"BLOCK","start":32650,"end":32673,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317554},"to":{"change":6,"start":317554,"end":317581},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":361,"ins":{"up_context":[{"change":6,"pos":317599}],"down_context":[{"change":6,"pos":317655}],"flag":"BLOCK","start":32674,"end":32722,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317599},"to":{"change":6,"start":317599,"end":317655},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":366,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28860}],"down_context":[{"change":6,"pos":317681}],"flag":"BLOCK","start":32723,"end":32745,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":370,"ins":{"up_context":[{"change":6,"pos":317733}],"down_context":[{"change":6,"pos":318013}],"flag":"BLOCK","start":32746,"end":32913,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317733},"to":{"change":6,"start":317733,"end":317945},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317945},"to":{"change":6,"start":9380,"end":9459},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_charlie.write().move_file(\"file1\", \"file3\", 0)?;"},{"Add":" let charlie_h ="},{"Add":" record_all(&repo_charlie, &changes, &txn_charlie, &channel_charlie, \"\").unwrap();"}],"del_contents":[{"Del":" txn_charlie.move_file(\"file1\", \"file3\")?;\n let charlie_h = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn_charlie,\n &mut channel_charlie,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":374,"ins":{"up_context":[{"change":6,"pos":318014}],"down_context":[{"change":6,"pos":318182}],"flag":"BLOCK","start":32914,"end":33076,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318014},"to":{"change":6,"start":28861,"end":29031},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &bob_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &bob_h)?;\n apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &alice_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":377,"ins":{"up_context":[{"change":6,"pos":318224}],"down_context":[{"change":6,"pos":318251}],"flag":"BLOCK","start":33077,"end":33100,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318224},"to":{"change":6,"start":318224,"end":318251},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":379,"ins":{"up_context":[{"change":6,"pos":318269}],"down_context":[{"change":6,"pos":318325}],"flag":"BLOCK","start":33101,"end":33149,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318269},"to":{"change":6,"start":318269,"end":318325},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":384,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29046}],"down_context":[{"change":6,"pos":318351}],"flag":"BLOCK","start":33150,"end":33172,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":387,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318359},"to":{"change":6,"start":9460,"end":9539},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":396,"ins":{"up_context":[{"change":6,"pos":5125}],"down_context":[{"change":6,"pos":5425}],"flag":"BLOCK","start":33173,"end":33376,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5125},"to":{"change":6,"start":5125,"end":5355},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5355},"to":{"change":6,"start":9540,"end":9619},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_charlie"},{"Add":" .write()"},{"Add":" .move_file(&files_charlie[1], \"file3\", 0)?;"},{"Add":" let _charlie_solution ="},{"Add":" record_all(&repo_charlie, &changes, &txn_charlie, &channel_charlie, \"\").unwrap();"}],"del_contents":[{"Del":" txn_charlie.move_file(&files_charlie[1], \"file3\")?;\n let _charlie_solution = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn_charlie,\n &mut channel_charlie,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":402,"ins":{"up_context":[{"change":6,"pos":5467}],"down_context":[{"change":6,"pos":5494}],"flag":"BLOCK","start":33377,"end":33400,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5467},"to":{"change":6,"start":5467,"end":5494},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":404,"ins":{"up_context":[{"change":6,"pos":5512}],"down_context":[{"change":6,"pos":5568}],"flag":"BLOCK","start":33401,"end":33449,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5512},"to":{"change":6,"start":5512,"end":5568},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":409,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29061}],"down_context":[{"change":6,"pos":5594}],"flag":"BLOCK","start":33450,"end":33472,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":417,"ins":{"up_context":[{"change":6,"pos":318584}],"down_context":[{"change":6,"pos":318808}],"flag":"BLOCK","start":33473,"end":33629,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318584},"to":{"change":6,"start":29062,"end":29226},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29226},"to":{"change":6,"start":9620,"end":9693},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318746},"to":{"change":6,"start":9620,"end":9693},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &charlie_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":420,"ins":{"up_context":[{"change":6,"pos":318850}],"down_context":[{"change":6,"pos":318875}],"flag":"BLOCK","start":33630,"end":33651,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318850},"to":{"change":6,"start":318850,"end":318875},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":422,"ins":{"up_context":[{"change":6,"pos":318893}],"down_context":[{"change":6,"pos":318945}],"flag":"BLOCK","start":33652,"end":33696,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":318893},"to":{"change":6,"start":318893,"end":318945},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":427,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29241}],"down_context":[{"change":6,"pos":318971}],"flag":"BLOCK","start":33697,"end":33719,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":434,"ins":{"up_context":[{"change":6,"pos":319125}],"down_context":[{"change":6,"pos":319353}],"flag":"BLOCK","start":33720,"end":33830,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":319125},"to":{"change":6,"start":319125,"end":319291},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":319291},"to":{"change":6,"start":9694,"end":9767},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let _alice_solution ="},{"Add":" record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let _alice_solution = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":438,"ins":{"up_context":[{"change":6,"pos":5867}],"down_context":[{"change":6,"pos":319600}],"flag":"BLOCK","start":33831,"end":33981,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5867},"to":{"change":6,"start":29242,"end":29400},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29400},"to":{"change":6,"start":9768,"end":9835},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":319544},"to":{"change":6,"start":9768,"end":9835},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &charlie_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":441,"ins":{"up_context":[{"change":6,"pos":319642}],"down_context":[{"change":6,"pos":319665}],"flag":"BLOCK","start":33982,"end":34001,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":319642},"to":{"change":6,"start":319642,"end":319665},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":443,"ins":{"up_context":[{"change":6,"pos":319683}],"down_context":[{"change":6,"pos":319731}],"flag":"BLOCK","start":34002,"end":34042,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":319683},"to":{"change":6,"start":319683,"end":319731},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":448,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29415}],"down_context":[{"change":6,"pos":319757}],"flag":"BLOCK","start":34043,"end":34065,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":456,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":320013},"to":{"change":6,"start":9836,"end":9903},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":466,"ins":{"up_context":[{"change":6,"pos":320276}],"down_context":[{"change":6,"pos":320398}],"flag":"BLOCK","start":34066,"end":34180,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":320276},"to":{"change":6,"start":320276,"end":320398},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":472,"ins":{"up_context":[{"change":6,"pos":320575}],"down_context":[{"change":6,"pos":320626}],"flag":"BLOCK","start":34181,"end":34237,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":320575},"to":{"change":6,"start":33079,"end":33139},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":474,"ins":{"up_context":[{"change":6,"pos":320688}],"down_context":[{"change":6,"pos":320735}],"flag":"BLOCK","start":34238,"end":34290,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":320688},"to":{"change":6,"start":33140,"end":33196},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":476,"ins":{"up_context":[{"change":6,"pos":320736}],"down_context":[{"change":6,"pos":320816}],"flag":"BLOCK","start":34291,"end":34375,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":320736},"to":{"change":6,"start":320736,"end":320816},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":478,"ins":{"up_context":[{"change":6,"pos":320817}],"down_context":[{"change":6,"pos":321070}],"flag":"BLOCK","start":34376,"end":34519,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":320817},"to":{"change":6,"start":320817,"end":321008},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321008},"to":{"change":6,"start":9904,"end":9977},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/c/file\", 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/c/file\").unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":482,"ins":{"up_context":[{"change":6,"pos":321089}],"down_context":[{"change":6,"pos":321247}],"flag":"BLOCK","start":34520,"end":34679,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321089},"to":{"change":6,"start":321089,"end":321163},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321163},"to":{"change":6,"start":29416,"end":29501},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":485,"ins":{"up_context":[{"change":6,"pos":321289}],"down_context":[{"change":6,"pos":321312}],"flag":"BLOCK","start":34680,"end":34699,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321289},"to":{"change":6,"start":321289,"end":321312},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":487,"ins":{"up_context":[{"change":6,"pos":321330}],"down_context":[{"change":6,"pos":321378}],"flag":"BLOCK","start":34700,"end":34740,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321330},"to":{"change":6,"start":321330,"end":321378},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":492,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29516}],"down_context":[{"change":6,"pos":321404}],"flag":"BLOCK","start":34741,"end":34763,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":495,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321412},"to":{"change":6,"start":9978,"end":10045},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":498,"ins":{"up_context":[{"change":6,"pos":321533}],"down_context":[{"change":6,"pos":321753}],"flag":"BLOCK","start":34764,"end":34858,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321533},"to":{"change":6,"start":321533,"end":321691},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321691},"to":{"change":6,"start":10046,"end":10119},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":501,"ins":{"up_context":[{"change":6,"pos":321778}],"down_context":[{"change":6,"pos":322033}],"flag":"BLOCK","start":34859,"end":35042,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321778},"to":{"change":6,"start":2932,"end":3000},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3000},"to":{"change":6,"start":321822,"end":321977},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321822},"to":{"change":6,"start":321822,"end":321977},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":321977},"to":{"change":6,"start":10120,"end":10187},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_bob"},{"Add":" .write_file(\"a/b/c/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(contents2)?;"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {\n"},{"Del":" w.write_all(contents2)?;\n Ok(())\n })?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":508,"ins":{"up_context":[{"change":6,"pos":322068}],"down_context":[{"change":6,"pos":322209}],"flag":"BLOCK","start":35043,"end":35119,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322068},"to":{"change":6,"start":29517,"end":29597},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29597},"to":{"change":6,"start":10188,"end":10261},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322147},"to":{"change":6,"start":10188,"end":10261},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":511,"ins":{"up_context":[{"change":6,"pos":322273}],"down_context":[{"change":6,"pos":322298}],"flag":"BLOCK","start":35120,"end":35141,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322273},"to":{"change":6,"start":322273,"end":322298},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":513,"ins":{"up_context":[{"change":6,"pos":322316}],"down_context":[{"change":6,"pos":322368}],"flag":"BLOCK","start":35142,"end":35186,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322316},"to":{"change":6,"start":322316,"end":322368},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":518,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29612}],"down_context":[{"change":6,"pos":322394}],"flag":"BLOCK","start":35187,"end":35209,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":521,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322402},"to":{"change":6,"start":10262,"end":10335},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":524,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":28468}],"down_context":[{"change":6,"pos":28468}],"flag":"BLOCK","start":35210,"end":35226,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" .read()"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":537,"ins":{"up_context":[{"change":6,"pos":322845}],"down_context":[{"change":6,"pos":323072}],"flag":"BLOCK","start":35227,"end":35328,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":322845},"to":{"change":6,"start":322845,"end":323010},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323010},"to":{"change":6,"start":10336,"end":10409},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_solution = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_solution = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":540,"ins":{"up_context":[{"change":6,"pos":323107}],"down_context":[{"change":6,"pos":323240}],"flag":"BLOCK","start":35329,"end":35403,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323107},"to":{"change":6,"start":29641,"end":29719},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29719},"to":{"change":6,"start":10410,"end":10477},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323184},"to":{"change":6,"start":10410,"end":10477},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":542,"ins":{"up_context":[{"change":6,"pos":323282}],"down_context":[{"change":6,"pos":323305}],"flag":"BLOCK","start":35404,"end":35423,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323282},"to":{"change":6,"start":323282,"end":323305},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":544,"ins":{"up_context":[{"change":6,"pos":323323}],"down_context":[{"change":6,"pos":323371}],"flag":"BLOCK","start":35424,"end":35464,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323323},"to":{"change":6,"start":323323,"end":323371},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":549,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29734}],"down_context":[{"change":6,"pos":323397}],"flag":"BLOCK","start":35465,"end":35487,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":554,"ins":{"up_context":[{"change":6,"pos":323517}],"down_context":[{"change":6,"pos":323657}],"flag":"BLOCK","start":35488,"end":35569,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323517},"to":{"change":6,"start":29735,"end":29820},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29820},"to":{"change":6,"start":10478,"end":10545},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323601},"to":{"change":6,"start":10478,"end":10545},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":556,"ins":{"up_context":[{"change":6,"pos":323699}],"down_context":[{"change":6,"pos":323722}],"flag":"BLOCK","start":35570,"end":35589,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323699},"to":{"change":6,"start":323699,"end":323722},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":558,"ins":{"up_context":[{"change":6,"pos":323740}],"down_context":[{"change":6,"pos":323788}],"flag":"BLOCK","start":35590,"end":35630,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":323740},"to":{"change":6,"start":323740,"end":323788},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":563,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29835}],"down_context":[{"change":6,"pos":323814}],"flag":"BLOCK","start":35631,"end":35653,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":579,"ins":{"up_context":[{"change":6,"pos":324204}],"down_context":[{"change":6,"pos":324264}],"flag":"BLOCK","start":35654,"end":35710,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324204},"to":{"change":6,"start":324204,"end":324264},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":584,"ins":{"up_context":[{"change":6,"pos":324441}],"down_context":[{"change":6,"pos":324492}],"flag":"BLOCK","start":35711,"end":35771,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324441},"to":{"change":6,"start":33197,"end":33257},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":586,"ins":{"up_context":[{"change":6,"pos":324554}],"down_context":[{"change":6,"pos":324601}],"flag":"BLOCK","start":35772,"end":35824,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324554},"to":{"change":6,"start":33258,"end":33314},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":588,"ins":{"up_context":[{"change":6,"pos":324602}],"down_context":[{"change":6,"pos":324682}],"flag":"BLOCK","start":35825,"end":35913,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324602},"to":{"change":6,"start":324602,"end":324682},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":590,"ins":{"up_context":[{"change":6,"pos":324683}],"down_context":[{"change":6,"pos":324936}],"flag":"BLOCK","start":35914,"end":36057,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324683},"to":{"change":6,"start":324683,"end":324874},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324874},"to":{"change":6,"start":10546,"end":10619},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/c/file\", 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/c/file\").unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":594,"ins":{"up_context":[{"change":6,"pos":324955}],"down_context":[{"change":6,"pos":325113}],"flag":"BLOCK","start":36058,"end":36217,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":324955},"to":{"change":6,"start":324955,"end":325029},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325029},"to":{"change":6,"start":29836,"end":29921},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":597,"ins":{"up_context":[{"change":6,"pos":325155}],"down_context":[{"change":6,"pos":325178}],"flag":"BLOCK","start":36218,"end":36237,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325155},"to":{"change":6,"start":325155,"end":325178},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":599,"ins":{"up_context":[{"change":6,"pos":325196}],"down_context":[{"change":6,"pos":325244}],"flag":"BLOCK","start":36238,"end":36278,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325196},"to":{"change":6,"start":325196,"end":325244},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":604,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":29936}],"down_context":[{"change":6,"pos":325270}],"flag":"BLOCK","start":36279,"end":36301,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":607,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325278},"to":{"change":6,"start":10620,"end":10687},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":618,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325557},"to":{"change":6,"start":10688,"end":10761},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":621,"ins":{"up_context":[{"change":6,"pos":325697}],"down_context":[{"change":6,"pos":326006}],"flag":"BLOCK","start":36302,"end":36550,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325697},"to":{"change":6,"start":3001,"end":3070},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3070},"to":{"change":6,"start":325742,"end":325950},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325742},"to":{"change":6,"start":325742,"end":325950},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":325950},"to":{"change":6,"start":10762,"end":10829},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_bob"},{"Add":" .write_file(\"a/b/c/file2\")"},{"Add":" .unwrap()"},{"Add":" .write_all(contents2)?;"},{"Add":" txn_bob.write().move_file(\"a/b/c/file\", \"a/b/c/file2\", 0)?;"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/c/file2\", |w| {\n"},{"Del":" w.write_all(contents2)?;\n Ok(())\n })?;\n txn_bob.move_file(\"a/b/c/file\", \"a/b/c/file2\")?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":629,"ins":{"up_context":[{"change":6,"pos":326041}],"down_context":[{"change":6,"pos":326182}],"flag":"BLOCK","start":36551,"end":36627,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326041},"to":{"change":6,"start":29937,"end":30017},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30017},"to":{"change":6,"start":10830,"end":10903},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326120},"to":{"change":6,"start":10830,"end":10903},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":633,"ins":{"up_context":[{"change":6,"pos":326247}],"down_context":[{"change":6,"pos":326272}],"flag":"BLOCK","start":36628,"end":36649,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326247},"to":{"change":6,"start":326247,"end":326272},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":635,"ins":{"up_context":[{"change":6,"pos":326290}],"down_context":[{"change":6,"pos":326342}],"flag":"BLOCK","start":36650,"end":36694,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326290},"to":{"change":6,"start":326290,"end":326342},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":640,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30032}],"down_context":[{"change":6,"pos":326368}],"flag":"BLOCK","start":36695,"end":36717,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":643,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326376},"to":{"change":6,"start":10904,"end":10977},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":650,"ins":{"up_context":[{"change":6,"pos":326732}],"down_context":[{"change":6,"pos":326780}],"flag":"BLOCK","start":36718,"end":36786,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326732},"to":{"change":6,"start":326732,"end":326780},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .move_file(\"a/b/c/file\", \"a/b/c/file2\", 0)"}],"del_contents":[{"Del":" .move_file(\"a/b/c/file\", \"a/b/c/file2\")\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":653,"ins":{"up_context":[{"change":6,"pos":326804}],"down_context":[{"change":6,"pos":327031}],"flag":"BLOCK","start":36787,"end":36888,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326804},"to":{"change":6,"start":326804,"end":326969},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":326969},"to":{"change":6,"start":10978,"end":11051},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_solution = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_solution = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice4\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":657,"ins":{"up_context":[{"change":6,"pos":327117}],"down_context":[{"change":6,"pos":327250}],"flag":"BLOCK","start":36889,"end":36963,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327117},"to":{"change":6,"start":30033,"end":30111},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30111},"to":{"change":6,"start":11052,"end":11119},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327194},"to":{"change":6,"start":11052,"end":11119},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":659,"ins":{"up_context":[{"change":6,"pos":327292}],"down_context":[{"change":6,"pos":327315}],"flag":"BLOCK","start":36964,"end":36983,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327292},"to":{"change":6,"start":327292,"end":327315},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":661,"ins":{"up_context":[{"change":6,"pos":327333}],"down_context":[{"change":6,"pos":327381}],"flag":"BLOCK","start":36984,"end":37024,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327333},"to":{"change":6,"start":327333,"end":327381},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":666,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30126}],"down_context":[{"change":6,"pos":327407}],"flag":"BLOCK","start":37025,"end":37047,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":671,"ins":{"up_context":[{"change":6,"pos":327527}],"down_context":[{"change":6,"pos":327667}],"flag":"BLOCK","start":37048,"end":37129,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327527},"to":{"change":6,"start":30127,"end":30212},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30212},"to":{"change":6,"start":11120,"end":11187},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327611},"to":{"change":6,"start":11120,"end":11187},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":673,"ins":{"up_context":[{"change":6,"pos":327709}],"down_context":[{"change":6,"pos":327732}],"flag":"BLOCK","start":37130,"end":37149,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327709},"to":{"change":6,"start":327709,"end":327732},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":675,"ins":{"up_context":[{"change":6,"pos":327750}],"down_context":[{"change":6,"pos":327798}],"flag":"BLOCK","start":37150,"end":37190,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":327750},"to":{"change":6,"start":327750,"end":327798},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":680,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30227}],"down_context":[{"change":6,"pos":327824}],"flag":"BLOCK","start":37191,"end":37213,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":698,"ins":{"up_context":[{"change":6,"pos":328263}],"down_context":[{"change":6,"pos":328323}],"flag":"BLOCK","start":37214,"end":37270,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":328263},"to":{"change":6,"start":328263,"end":328323},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":703,"ins":{"up_context":[{"change":6,"pos":328500}],"down_context":[{"change":6,"pos":328551}],"flag":"BLOCK","start":37271,"end":37331,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":328500},"to":{"change":6,"start":33315,"end":33375},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":705,"ins":{"up_context":[{"change":6,"pos":328613}],"down_context":[{"change":6,"pos":328660}],"flag":"BLOCK","start":37332,"end":37384,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":328613},"to":{"change":6,"start":33376,"end":33432},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":707,"ins":{"up_context":[{"change":6,"pos":328661}],"down_context":[{"change":6,"pos":328741}],"flag":"BLOCK","start":37385,"end":37473,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":328661},"to":{"change":6,"start":328661,"end":328741},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":709,"ins":{"up_context":[{"change":6,"pos":328742}],"down_context":[{"change":6,"pos":328789}],"flag":"BLOCK","start":37474,"end":37532,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":328742},"to":{"change":6,"start":328742,"end":328789},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/c/file\", 0).unwrap();"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/c/file\").unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":717,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":328933},"to":{"change":6,"start":11188,"end":11261},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":719,"ins":{"up_context":[{"change":6,"pos":329014}],"down_context":[{"change":6,"pos":329172}],"flag":"BLOCK","start":37533,"end":37692,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329014},"to":{"change":6,"start":329014,"end":329088},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329088},"to":{"change":6,"start":30228,"end":30313},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":722,"ins":{"up_context":[{"change":6,"pos":329214}],"down_context":[{"change":6,"pos":329237}],"flag":"BLOCK","start":37693,"end":37712,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329214},"to":{"change":6,"start":329214,"end":329237},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":724,"ins":{"up_context":[{"change":6,"pos":329255}],"down_context":[{"change":6,"pos":329303}],"flag":"BLOCK","start":37713,"end":37753,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329255},"to":{"change":6,"start":329255,"end":329303},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":729,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30328}],"down_context":[{"change":6,"pos":329329}],"flag":"BLOCK","start":37754,"end":37776,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":732,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329337},"to":{"change":6,"start":11262,"end":11329},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":743,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329616},"to":{"change":6,"start":11330,"end":11403},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":746,"ins":{"up_context":[{"change":6,"pos":329745}],"down_context":[{"change":6,"pos":330042}],"flag":"BLOCK","start":37777,"end":38013,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329745},"to":{"change":6,"start":3071,"end":3139},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3139},"to":{"change":6,"start":329789,"end":329986},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329789},"to":{"change":6,"start":329789,"end":329986},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":329986},"to":{"change":6,"start":11404,"end":11471},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_bob"},{"Add":" .write_file(\"a/b/d/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(contents2)?;"},{"Add":" txn_bob.write().move_file(\"a/b/c\", \"a/b/d\", 0)?;"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/d/file\", |w| {\n"},{"Del":" w.write_all(contents2)?;\n Ok(())\n })?;\n txn_bob.move_file(\"a/b/c\", \"a/b/d\")?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":754,"ins":{"up_context":[{"change":6,"pos":330077}],"down_context":[{"change":6,"pos":330218}],"flag":"BLOCK","start":38014,"end":38090,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330077},"to":{"change":6,"start":30329,"end":30409},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30409},"to":{"change":6,"start":11472,"end":11545},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330156},"to":{"change":6,"start":11472,"end":11545},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":757,"ins":{"up_context":[{"change":6,"pos":330282}],"down_context":[{"change":6,"pos":330307}],"flag":"BLOCK","start":38091,"end":38112,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330282},"to":{"change":6,"start":330282,"end":330307},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":759,"ins":{"up_context":[{"change":6,"pos":330325}],"down_context":[{"change":6,"pos":330377}],"flag":"BLOCK","start":38113,"end":38157,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330325},"to":{"change":6,"start":330325,"end":330377},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":764,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30424}],"down_context":[{"change":6,"pos":330403}],"flag":"BLOCK","start":38158,"end":38180,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":767,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330411},"to":{"change":6,"start":11546,"end":11619},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":769,"ins":{"up_context":[{"change":6,"pos":330575}],"down_context":[{"change":6,"pos":330631}],"flag":"BLOCK","start":38181,"end":38248,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330575},"to":{"change":6,"start":330575,"end":330631},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/d/file\", 0).unwrap_or(());"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/d/file\").unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":772,"ins":{"up_context":[{"change":6,"pos":330708}],"down_context":[{"change":6,"pos":330764}],"flag":"BLOCK","start":38249,"end":38316,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330708},"to":{"change":6,"start":330708,"end":330764},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"a/b/c\", \"a/b/d\", 0).unwrap();"}],"del_contents":[{"Del":" txn_alice.move_file(\"a/b/c\", \"a/b/d\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":776,"ins":{"up_context":[{"change":6,"pos":330853}],"down_context":[{"change":6,"pos":331080}],"flag":"BLOCK","start":38317,"end":38418,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":330853},"to":{"change":6,"start":330853,"end":331018},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331018},"to":{"change":6,"start":11620,"end":11693},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_solution = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_solution = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice4\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":780,"ins":{"up_context":[{"change":6,"pos":331166}],"down_context":[{"change":6,"pos":331299}],"flag":"BLOCK","start":38419,"end":38493,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331166},"to":{"change":6,"start":30425,"end":30503},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30503},"to":{"change":6,"start":11694,"end":11761},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331243},"to":{"change":6,"start":11694,"end":11761},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":782,"ins":{"up_context":[{"change":6,"pos":331341}],"down_context":[{"change":6,"pos":331364}],"flag":"BLOCK","start":38494,"end":38513,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331341},"to":{"change":6,"start":331341,"end":331364},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":784,"ins":{"up_context":[{"change":6,"pos":331382}],"down_context":[{"change":6,"pos":331430}],"flag":"BLOCK","start":38514,"end":38554,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331382},"to":{"change":6,"start":331382,"end":331430},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":789,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30518}],"down_context":[{"change":6,"pos":331456}],"flag":"BLOCK","start":38555,"end":38577,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":795,"ins":{"up_context":[{"change":6,"pos":331577}],"down_context":[{"change":6,"pos":331717}],"flag":"BLOCK","start":38578,"end":38659,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331577},"to":{"change":6,"start":30519,"end":30604},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30604},"to":{"change":6,"start":11762,"end":11829},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331661},"to":{"change":6,"start":11762,"end":11829},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":797,"ins":{"up_context":[{"change":6,"pos":331759}],"down_context":[{"change":6,"pos":331782}],"flag":"BLOCK","start":38660,"end":38679,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331759},"to":{"change":6,"start":331759,"end":331782},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":799,"ins":{"up_context":[{"change":6,"pos":331800}],"down_context":[{"change":6,"pos":331848}],"flag":"BLOCK","start":38680,"end":38720,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":331800},"to":{"change":6,"start":331800,"end":331848},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":804,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30619}],"down_context":[{"change":6,"pos":331874}],"flag":"BLOCK","start":38721,"end":38743,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":823,"ins":{"up_context":[{"change":6,"pos":332340}],"down_context":[{"change":6,"pos":332526}],"flag":"BLOCK","start":38744,"end":38918,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":332340},"to":{"change":6,"start":332340,"end":332526},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let repo_charlie = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n let mut repo_charlie = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":829,"ins":{"up_context":[{"change":6,"pos":332645}],"down_context":[{"change":6,"pos":332696}],"flag":"BLOCK","start":38919,"end":38975,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":332645},"to":{"change":6,"start":33433,"end":33493},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":831,"ins":{"up_context":[{"change":6,"pos":332758}],"down_context":[{"change":6,"pos":332805}],"flag":"BLOCK","start":38976,"end":39028,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":332758},"to":{"change":6,"start":33494,"end":33550},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":833,"ins":{"up_context":[{"change":6,"pos":332871}],"down_context":[{"change":6,"pos":332926}],"flag":"BLOCK","start":39029,"end":39089,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":332871},"to":{"change":6,"start":33551,"end":33615},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_charlie = env_charlie.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_charlie = env_charlie.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":835,"ins":{"up_context":[{"change":6,"pos":332927}],"down_context":[{"change":6,"pos":333007}],"flag":"BLOCK","start":39090,"end":39174,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":332927},"to":{"change":6,"start":332927,"end":333007},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":838,"ins":{"up_context":[{"change":6,"pos":333066}],"down_context":[{"change":6,"pos":333319}],"flag":"BLOCK","start":39175,"end":39318,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333066},"to":{"change":6,"start":333066,"end":333257},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333257},"to":{"change":6,"start":11830,"end":11903},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/c/file\", 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/c/file\").unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":842,"ins":{"up_context":[{"change":6,"pos":333349}],"down_context":[{"change":6,"pos":333507}],"flag":"BLOCK","start":39319,"end":39478,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333349},"to":{"change":6,"start":333349,"end":333423},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333423},"to":{"change":6,"start":30620,"end":30705},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":845,"ins":{"up_context":[{"change":6,"pos":333549}],"down_context":[{"change":6,"pos":333572}],"flag":"BLOCK","start":39479,"end":39498,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333549},"to":{"change":6,"start":333549,"end":333572},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":847,"ins":{"up_context":[{"change":6,"pos":333590}],"down_context":[{"change":6,"pos":333638}],"flag":"BLOCK","start":39499,"end":39539,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333590},"to":{"change":6,"start":333590,"end":333638},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":852,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30720}],"down_context":[{"change":6,"pos":333664}],"flag":"BLOCK","start":39540,"end":39562,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":855,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333672},"to":{"change":6,"start":11904,"end":11971},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":856,"ins":{"up_context":[{"change":6,"pos":333729}],"down_context":[{"change":6,"pos":333907}],"flag":"BLOCK","start":39563,"end":39769,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333729},"to":{"change":6,"start":333729,"end":333815},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333815},"to":{"change":6,"start":30721,"end":30814},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_charlie = txn_charlie"},{"Add":" .write()"},{"Add":" .open_or_create_channel(\"charlie\")"},{"Add":" .unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_charlie = txn_charlie.open_or_create_channel(\"charlie\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":862,"ins":{"up_context":[{"change":6,"pos":333965}],"down_context":[{"change":6,"pos":333992}],"flag":"BLOCK","start":39770,"end":39793,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":333965},"to":{"change":6,"start":333965,"end":333992},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":864,"ins":{"up_context":[{"change":6,"pos":334010}],"down_context":[{"change":6,"pos":334066}],"flag":"BLOCK","start":39794,"end":39842,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334010},"to":{"change":6,"start":334010,"end":334066},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":869,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":30829}],"down_context":[{"change":6,"pos":334092}],"flag":"BLOCK","start":39843,"end":39865,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":872,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334100},"to":{"change":6,"start":11972,"end":12051},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":878,"ins":{"up_context":[{"change":6,"pos":334328}],"down_context":[{"change":6,"pos":334548}],"flag":"BLOCK","start":39866,"end":39960,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334328},"to":{"change":6,"start":334328,"end":334486},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334486},"to":{"change":6,"start":12052,"end":12125},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap();"}],"del_contents":[{"Del":" let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":881,"ins":{"up_context":[{"change":6,"pos":334573}],"down_context":[{"change":6,"pos":334828}],"flag":"BLOCK","start":39961,"end":40144,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334573},"to":{"change":6,"start":3140,"end":3208},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3208},"to":{"change":6,"start":334617,"end":334772},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334617},"to":{"change":6,"start":334617,"end":334772},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334772},"to":{"change":6,"start":12126,"end":12193},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_bob"},{"Add":" .write_file(\"a/b/c/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(contents2)?;"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {\n"},{"Del":" w.write_all(contents2)?;\n Ok(())\n })?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":888,"ins":{"up_context":[{"change":6,"pos":334857}],"down_context":[{"change":6,"pos":335196}],"flag":"BLOCK","start":40145,"end":40356,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334857},"to":{"change":6,"start":3209,"end":3281},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3281},"to":{"change":6,"start":334905,"end":335128},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":334905},"to":{"change":6,"start":334905,"end":335128},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335128},"to":{"change":6,"start":12194,"end":12273},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_charlie"},{"Add":" .write_file(\"a/b/c/file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(contents3)?;"},{"Add":" let charlie_h ="},{"Add":" record_all(&repo_charlie, &changes, &txn_charlie, &channel_charlie, \"\").unwrap();"}],"del_contents":[{"Del":" repo_charlie.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {\n"},{"Del":" w.write_all(contents3)?;\n Ok(())\n })?;\n let charlie_h = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn_charlie,\n &mut channel_charlie,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":896,"ins":{"up_context":[{"change":6,"pos":335246}],"down_context":[{"change":6,"pos":335470}],"flag":"BLOCK","start":40357,"end":40513,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335246},"to":{"change":6,"start":30830,"end":30994},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30994},"to":{"change":6,"start":12274,"end":12347},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335408},"to":{"change":6,"start":12274,"end":12347},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &charlie_h)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":900,"ins":{"up_context":[{"change":6,"pos":335550}],"down_context":[{"change":6,"pos":335575}],"flag":"BLOCK","start":40514,"end":40535,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335550},"to":{"change":6,"start":335550,"end":335575},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":902,"ins":{"up_context":[{"change":6,"pos":335593}],"down_context":[{"change":6,"pos":335645}],"flag":"BLOCK","start":40536,"end":40580,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335593},"to":{"change":6,"start":335593,"end":335645},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":907,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31009}],"down_context":[{"change":6,"pos":335671}],"flag":"BLOCK","start":40581,"end":40603,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":910,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335679},"to":{"change":6,"start":12348,"end":12421},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":912,"ins":{"up_context":[{"change":6,"pos":335858}],"down_context":[{"change":6,"pos":336052}],"flag":"BLOCK","start":40604,"end":41028,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":335858},"to":{"change":6,"start":335858,"end":336052},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let expected = ["},{"Add":" Conflict::ZombieFile {"},{"Add":" path: \"a/b\".to_string(),"},{"Add":" },"},{"Add":" Conflict::ZombieFile {"},{"Add":" path: \"a/b/c\".to_string(),"},{"Add":" },"},{"Add":" Conflict::ZombieFile {"},{"Add":" path: \"a/b/c/file\".to_string(),"},{"Add":" },"},{"Add":" Conflict::Zombie {"},{"Add":" path: \"a/b/c/file\".to_string(),"},{"Add":" line: 1,"},{"Add":" },"},{"Add":" ];"},{"Add":" assert_eq!(&conflicts[..], &expected[..]);"}],"del_contents":[{"Del":" assert_eq!(conflicts.len(), 5);\n match conflicts[0] {\n Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),\n ref c => panic!(\"unexpected conflict {:#?}\", c),\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":931,"ins":{"up_context":[{"change":6,"pos":336172}],"down_context":[{"change":6,"pos":336218}],"flag":"BLOCK","start":41029,"end":41101,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336172},"to":{"change":6,"start":3282,"end":3352},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"a/b/c/file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"a/b/c/file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":938,"ins":{"up_context":[{"change":6,"pos":336372}],"down_context":[{"change":6,"pos":336396}],"flag":"BLOCK","start":41102,"end":41108,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336372},"to":{"change":6,"start":336372,"end":336396},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":940,"ins":{"up_context":[{"change":6,"pos":336397}],"down_context":[{"change":6,"pos":336611}],"flag":"BLOCK","start":41109,"end":41202,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336397},"to":{"change":6,"start":336397,"end":336549},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336549},"to":{"change":6,"start":12422,"end":12495},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let alice_solution = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let alice_solution = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":943,"ins":{"up_context":[{"change":6,"pos":336631}],"down_context":[{"change":6,"pos":336843}],"flag":"BLOCK","start":41203,"end":41353,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336631},"to":{"change":6,"start":31010,"end":31168},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31168},"to":{"change":6,"start":12496,"end":12563},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336787},"to":{"change":6,"start":12496,"end":12563},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &charlie_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h)?;\n apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &charlie_h)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":946,"ins":{"up_context":[{"change":6,"pos":336901}],"down_context":[{"change":6,"pos":336924}],"flag":"BLOCK","start":41354,"end":41373,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336901},"to":{"change":6,"start":336901,"end":336924},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":948,"ins":{"up_context":[{"change":6,"pos":336942}],"down_context":[{"change":6,"pos":336990}],"flag":"BLOCK","start":41374,"end":41414,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":336942},"to":{"change":6,"start":336942,"end":336990},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":953,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31183}],"down_context":[{"change":6,"pos":337016}],"flag":"BLOCK","start":41415,"end":41437,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":956,"ins":{"up_context":[{"change":6,"pos":337024}],"down_context":[{"change":6,"pos":337274}],"flag":"BLOCK","start":41438,"end":41476,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337024},"to":{"change":6,"start":12564,"end":12631},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":12631},"to":{"change":6,"start":337080,"end":337274},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":19875},"to":{"change":6,"start":337080,"end":337274},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337080},"to":{"change":6,"start":337080,"end":337274},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":""},{"Add":" assert_eq!(conflicts, expected);"}],"del_contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"},{"Del":" assert_eq!(conflicts.len(), 5);\n match conflicts[0] {\n Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),\n ref c => panic!(\"unexpected conflict {:#?}\", c),\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":959,"ins":{"up_context":[{"change":6,"pos":337275}],"down_context":[{"change":6,"pos":337415}],"flag":"BLOCK","start":41477,"end":41558,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337275},"to":{"change":6,"start":31184,"end":31269},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31269},"to":{"change":6,"start":12632,"end":12699},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337359},"to":{"change":6,"start":12632,"end":12699},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_solution)?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":961,"ins":{"up_context":[{"change":6,"pos":337473}],"down_context":[{"change":6,"pos":337496}],"flag":"BLOCK","start":41559,"end":41578,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337473},"to":{"change":6,"start":337473,"end":337496},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":963,"ins":{"up_context":[{"change":6,"pos":337514}],"down_context":[{"change":6,"pos":337562}],"flag":"BLOCK","start":41579,"end":41619,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337514},"to":{"change":6,"start":337514,"end":337562},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":968,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31284}],"down_context":[{"change":6,"pos":337588}],"flag":"BLOCK","start":41620,"end":41642,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":976,"ins":{"up_context":[{"change":6,"pos":337711}],"down_context":[{"change":6,"pos":337862}],"flag":"BLOCK","start":41643,"end":41723,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337711},"to":{"change":6,"start":31285,"end":31369},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31369},"to":{"change":6,"start":12700,"end":12779},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337794},"to":{"change":6,"start":12700,"end":12779},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &bob_h)?;\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":978,"ins":{"up_context":[{"change":6,"pos":337908}],"down_context":[{"change":6,"pos":338061}],"flag":"BLOCK","start":41724,"end":41806,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337908},"to":{"change":6,"start":31370,"end":31456},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31456},"to":{"change":6,"start":12780,"end":12859},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":337993},"to":{"change":6,"start":12780,"end":12859},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &alice_h)?;\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":980,"ins":{"up_context":[{"change":6,"pos":338119}],"down_context":[{"change":6,"pos":338146}],"flag":"BLOCK","start":41807,"end":41830,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338119},"to":{"change":6,"start":338119,"end":338146},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":982,"ins":{"up_context":[{"change":6,"pos":338164}],"down_context":[{"change":6,"pos":338220}],"flag":"BLOCK","start":41831,"end":41879,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338164},"to":{"change":6,"start":338164,"end":338220},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":987,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31471}],"down_context":[{"change":6,"pos":338246}],"flag":"BLOCK","start":41880,"end":41902,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":990,"ins":{"up_context":[{"change":6,"pos":338254}],"down_context":[{"change":6,"pos":338448}],"flag":"BLOCK","start":41903,"end":41940,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338254},"to":{"change":6,"start":338254,"end":338448},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" assert_eq!(conflicts, expected);"}],"del_contents":[{"Del":" assert_eq!(conflicts.len(), 5);\n match conflicts[0] {\n Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b\"),\n ref c => panic!(\"unexpected conflict {:#?}\", c),\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":992,"ins":{"up_context":[{"change":6,"pos":338496}],"down_context":[{"change":6,"pos":338695}],"flag":"BLOCK","start":41941,"end":42030,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338496},"to":{"change":6,"start":338496,"end":338595},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338595},"to":{"change":6,"start":31472,"end":31497},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31497},"to":{"change":6,"start":338619,"end":338627},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338619},"to":{"change":6,"start":338619,"end":338627},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338627},"to":{"change":6,"start":12860,"end":12939},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &alice_solution)?;"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut txn_charlie,\n &mut channel_charlie,\n"},{"Del":" &alice_solution,\n"},{"Del":" )?;\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie4\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":994,"ins":{"up_context":[{"change":6,"pos":338753}],"down_context":[{"change":6,"pos":338780}],"flag":"BLOCK","start":42031,"end":42054,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338753},"to":{"change":6,"start":338753,"end":338780},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":996,"ins":{"up_context":[{"change":6,"pos":338798}],"down_context":[{"change":6,"pos":338854}],"flag":"BLOCK","start":42055,"end":42103,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":338798},"to":{"change":6,"start":338798,"end":338854},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1001,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31512}],"down_context":[{"change":6,"pos":338880}],"flag":"BLOCK","start":42104,"end":42126,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1017,"ins":{"up_context":[{"change":6,"pos":339153}],"down_context":[{"change":6,"pos":339339}],"flag":"BLOCK","start":42127,"end":42301,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339153},"to":{"change":6,"start":339153,"end":339339},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let repo_charlie = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n let mut repo_charlie = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1023,"ins":{"up_context":[{"change":6,"pos":339458}],"down_context":[{"change":6,"pos":339509}],"flag":"BLOCK","start":42302,"end":42358,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339458},"to":{"change":6,"start":33616,"end":33676},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1025,"ins":{"up_context":[{"change":6,"pos":339571}],"down_context":[{"change":6,"pos":339618}],"flag":"BLOCK","start":42359,"end":42411,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339571},"to":{"change":6,"start":33677,"end":33733},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1027,"ins":{"up_context":[{"change":6,"pos":339684}],"down_context":[{"change":6,"pos":339739}],"flag":"BLOCK","start":42412,"end":42472,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339684},"to":{"change":6,"start":33734,"end":33798},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_charlie = env_charlie.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_charlie = env_charlie.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1029,"ins":{"up_context":[{"change":6,"pos":339740}],"down_context":[{"change":6,"pos":339820}],"flag":"BLOCK","start":42473,"end":42557,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339740},"to":{"change":6,"start":339740,"end":339820},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1032,"ins":{"up_context":[{"change":6,"pos":339879}],"down_context":[{"change":6,"pos":340132}],"flag":"BLOCK","start":42558,"end":42701,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339879},"to":{"change":6,"start":339879,"end":340070},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340070},"to":{"change":6,"start":12940,"end":13013},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"a/b/c/file\", 0).unwrap();"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"a/b/c/file\").unwrap();\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1036,"ins":{"up_context":[{"change":6,"pos":340186}],"down_context":[{"change":6,"pos":340448}],"flag":"BLOCK","start":42702,"end":42872,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340186},"to":{"change":6,"start":340186,"end":340386},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340386},"to":{"change":6,"start":13014,"end":13087},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice"},{"Add":" .write()"},{"Add":" .move_file(\"a/b/c/file\", \"a/b/c/alice\", 0)?;"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.move_file(\"a/b/c/file\", \"a/b/c/alice\")?;\n let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1042,"ins":{"up_context":[{"change":6,"pos":340467}],"down_context":[{"change":6,"pos":340625}],"flag":"BLOCK","start":42873,"end":43032,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340467},"to":{"change":6,"start":340467,"end":340541},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340541},"to":{"change":6,"start":31513,"end":31598},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1045,"ins":{"up_context":[{"change":6,"pos":340667}],"down_context":[{"change":6,"pos":340690}],"flag":"BLOCK","start":43033,"end":43052,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340667},"to":{"change":6,"start":340667,"end":340690},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1047,"ins":{"up_context":[{"change":6,"pos":340708}],"down_context":[{"change":6,"pos":340756}],"flag":"BLOCK","start":43053,"end":43093,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340708},"to":{"change":6,"start":340708,"end":340756},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1052,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31613}],"down_context":[{"change":6,"pos":340782}],"flag":"BLOCK","start":43094,"end":43116,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1055,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340790},"to":{"change":6,"start":13088,"end":13155},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1058,"ins":{"up_context":[{"change":6,"pos":340914}],"down_context":[{"change":6,"pos":341153}],"flag":"BLOCK","start":43117,"end":43285,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":340914},"to":{"change":6,"start":340914,"end":341012},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341012},"to":{"change":6,"start":31614,"end":31700},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31700},"to":{"change":6,"start":13156,"end":13223},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341097},"to":{"change":6,"start":13156,"end":13223},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &alice_h).unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1061,"ins":{"up_context":[{"change":6,"pos":341211}],"down_context":[{"change":6,"pos":341234}],"flag":"BLOCK","start":43286,"end":43305,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341211},"to":{"change":6,"start":341211,"end":341234},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1063,"ins":{"up_context":[{"change":6,"pos":341252}],"down_context":[{"change":6,"pos":341300}],"flag":"BLOCK","start":43306,"end":43346,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341252},"to":{"change":6,"start":341252,"end":341300},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1068,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31715}],"down_context":[{"change":6,"pos":341326}],"flag":"BLOCK","start":43347,"end":43369,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1079,"ins":{"up_context":[{"change":6,"pos":341609}],"down_context":[{"change":6,"pos":341780}],"flag":"BLOCK","start":43370,"end":43465,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341609},"to":{"change":6,"start":341609,"end":341724},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341724},"to":{"change":6,"start":13224,"end":13291},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_resolution = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let bob_resolution =\n record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1081,"ins":{"up_context":[{"change":6,"pos":341838}],"down_context":[{"change":6,"pos":341861}],"flag":"BLOCK","start":43466,"end":43485,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341838},"to":{"change":6,"start":341838,"end":341861},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1083,"ins":{"up_context":[{"change":6,"pos":341879}],"down_context":[{"change":6,"pos":341927}],"flag":"BLOCK","start":43486,"end":43526,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":341879},"to":{"change":6,"start":341879,"end":341927},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1088,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31730}],"down_context":[{"change":6,"pos":341953}],"flag":"BLOCK","start":43527,"end":43549,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1097,"ins":{"up_context":[{"change":6,"pos":342146}],"down_context":[{"change":6,"pos":342329}],"flag":"BLOCK","start":43550,"end":43727,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":342146},"to":{"change":6,"start":31731,"end":31819},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31819},"to":{"change":6,"start":4906,"end":5047},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h).unwrap();\n"},{"Del":" apply::apply_change(\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n &bob_resolution,\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1100,"ins":{"up_context":[{"change":6,"pos":342387}],"down_context":[{"change":6,"pos":342412}],"flag":"BLOCK","start":43728,"end":43749,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":342387},"to":{"change":6,"start":342387,"end":342412},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1102,"ins":{"up_context":[{"change":6,"pos":342430}],"down_context":[{"change":6,"pos":342482}],"flag":"BLOCK","start":43750,"end":43794,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":342430},"to":{"change":6,"start":342430,"end":342482},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1107,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":31931}],"down_context":[{"change":6,"pos":342508}],"flag":"BLOCK","start":43795,"end":43817,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1110,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":342516},"to":{"change":6,"start":13292,"end":13365},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1115,"ins":{"up_context":[{"change":6,"pos":5945}],"down_context":[{"change":6,"pos":342992}],"flag":"BLOCK","start":43818,"end":44114,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":5945},"to":{"change":6,"start":342721,"end":342807},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":342721},"to":{"change":6,"start":342721,"end":342807},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":342807},"to":{"change":6,"start":31932,"end":32119},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let channel_charlie = txn_charlie"},{"Add":" .write()"},{"Add":" .open_or_create_channel(\"charlie\")"},{"Add":" .unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &init_h).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &alice_h).unwrap();"}],"del_contents":[{"Del":" let mut channel_charlie = txn_charlie.open_or_create_channel(\"charlie\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &init_h).unwrap();\n apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1122,"ins":{"up_context":[{"change":6,"pos":343050}],"down_context":[{"change":6,"pos":343077}],"flag":"BLOCK","start":44115,"end":44138,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343050},"to":{"change":6,"start":343050,"end":343077},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1124,"ins":{"up_context":[{"change":6,"pos":343095}],"down_context":[{"change":6,"pos":343151}],"flag":"BLOCK","start":44139,"end":44187,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343095},"to":{"change":6,"start":343095,"end":343151},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1129,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32134}],"down_context":[{"change":6,"pos":343177}],"flag":"BLOCK","start":44188,"end":44210,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1132,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343185},"to":{"change":6,"start":13366,"end":13445},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1138,"ins":{"up_context":[{"change":6,"pos":343451}],"down_context":[{"change":6,"pos":343685}],"flag":"BLOCK","start":44211,"end":44321,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343451},"to":{"change":6,"start":343451,"end":343617},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343617},"to":{"change":6,"start":13446,"end":13525},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let charlie_h ="},{"Add":" record_all(&repo_charlie, &changes, &txn_charlie, &channel_charlie, \"\").unwrap();"}],"del_contents":[{"Del":" let charlie_h = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn_charlie,\n &mut channel_charlie,\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1143,"ins":{"up_context":[{"change":6,"pos":5992}],"down_context":[{"change":6,"pos":5993}],"flag":"BLOCK","start":44322,"end":44410,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5992},"to":{"change":6,"start":32135,"end":32227},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32227},"to":{"change":6,"start":13526,"end":13605},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343784},"to":{"change":6,"start":13526,"end":13605},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &bob_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_charlie, &mut channel_charlie, &bob_h).unwrap();\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1145,"ins":{"up_context":[{"change":6,"pos":6041}],"down_context":[{"change":6,"pos":344064}],"flag":"BLOCK","start":44411,"end":44508,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":6041},"to":{"change":6,"start":343852,"end":343951},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20732},"to":{"change":6,"start":343852,"end":343951},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343852},"to":{"change":6,"start":343852,"end":343951},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343951},"to":{"change":6,"start":32228,"end":32253},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32253},"to":{"change":6,"start":343975,"end":343996},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343975},"to":{"change":6,"start":343975,"end":343996},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":343996},"to":{"change":6,"start":13606,"end":13685},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_charlie, &channel_charlie, &bob_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(\n &changes,\n &mut txn_charlie,\n &mut channel_charlie,\n"},{"Del":" &bob_resolution,\n"},{"Del":" )\n .unwrap();\n"},{"Del":" debug_to_file(&txn_charlie, &channel_charlie.borrow(), \"debug_charlie3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1147,"ins":{"up_context":[{"change":6,"pos":344122}],"down_context":[{"change":6,"pos":344149}],"flag":"BLOCK","start":44509,"end":44532,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":344122},"to":{"change":6,"start":344122,"end":344149},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1149,"ins":{"up_context":[{"change":6,"pos":344167}],"down_context":[{"change":6,"pos":344223}],"flag":"BLOCK","start":44533,"end":44581,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":344167},"to":{"change":6,"start":344167,"end":344223},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_charlie,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn_charlie,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1154,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32268}],"down_context":[{"change":6,"pos":344249}],"flag":"BLOCK","start":44582,"end":44604,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1165,"ins":{"up_context":[{"change":6,"pos":6230}],"down_context":[{"change":6,"pos":344796}],"flag":"BLOCK","start":44605,"end":44693,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6230},"to":{"change":6,"start":32269,"end":32361},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32361},"to":{"change":6,"start":13686,"end":13759},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":344734},"to":{"change":6,"start":13686,"end":13759},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &charlie_h).unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1167,"ins":{"up_context":[{"change":6,"pos":344854}],"down_context":[{"change":6,"pos":344879}],"flag":"BLOCK","start":44694,"end":44715,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":344854},"to":{"change":6,"start":344854,"end":344879},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1169,"ins":{"up_context":[{"change":6,"pos":344897}],"down_context":[{"change":6,"pos":344949}],"flag":"BLOCK","start":44716,"end":44760,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":344897},"to":{"change":6,"start":344897,"end":344949},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1174,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32376}],"down_context":[{"change":6,"pos":344975}],"flag":"BLOCK","start":44761,"end":44783,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1184,"ins":{"up_context":[{"change":6,"pos":345216}],"down_context":[{"change":6,"pos":345359}],"flag":"BLOCK","start":44784,"end":44868,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":345216},"to":{"change":6,"start":32377,"end":32465},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32465},"to":{"change":6,"start":13760,"end":13827},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":345303},"to":{"change":6,"start":13760,"end":13827},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &charlie_h).unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob3\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1187,"ins":{"up_context":[{"change":6,"pos":345418}],"down_context":[{"change":6,"pos":345441}],"flag":"BLOCK","start":44869,"end":44888,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":345418},"to":{"change":6,"start":345418,"end":345441},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1189,"ins":{"up_context":[{"change":6,"pos":345459}],"down_context":[{"change":6,"pos":345507}],"flag":"BLOCK","start":44889,"end":44929,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":345459},"to":{"change":6,"start":345459,"end":345507},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1194,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32480}],"down_context":[{"change":6,"pos":345533}],"flag":"BLOCK","start":44930,"end":44952,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1210,"ins":{"up_context":[{"change":6,"pos":345888}],"down_context":[{"change":6,"pos":346010}],"flag":"BLOCK","start":44953,"end":45067,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":345888},"to":{"change":6,"start":345888,"end":346010},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1214,"ins":{"up_context":[{"change":6,"pos":346128}],"down_context":[{"change":6,"pos":346250}],"flag":"BLOCK","start":45068,"end":45199,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346128},"to":{"change":6,"start":33799,"end":33859},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33859},"to":{"change":6,"start":346179,"end":346250},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346179},"to":{"change":6,"start":346179,"end":346250},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1217,"ins":{"up_context":[{"change":6,"pos":346300}],"down_context":[{"change":6,"pos":346475}],"flag":"BLOCK","start":45200,"end":45327,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346300},"to":{"change":6,"start":346300,"end":346475},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file\", 0)?;"},{"Add":" let init = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"file\")?;\n let init = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1221,"ins":{"up_context":[{"change":6,"pos":346538}],"down_context":[{"change":6,"pos":346652}],"flag":"BLOCK","start":45328,"end":45451,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346538},"to":{"change":6,"start":33860,"end":33916},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33916},"to":{"change":6,"start":346585,"end":346652},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346585},"to":{"change":6,"start":346585,"end":346652},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1224,"ins":{"up_context":[{"change":6,"pos":346664}],"down_context":[{"change":6,"pos":346720}],"flag":"BLOCK","start":45452,"end":45535,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346664},"to":{"change":6,"start":32481,"end":32538},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &init)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, &init)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1228,"ins":{"up_context":[{"change":6,"pos":346781}],"down_context":[{"change":6,"pos":346804}],"flag":"BLOCK","start":45536,"end":45555,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346781},"to":{"change":6,"start":346781,"end":346804},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1230,"ins":{"up_context":[{"change":6,"pos":346822}],"down_context":[{"change":6,"pos":346870}],"flag":"BLOCK","start":45556,"end":45596,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346822},"to":{"change":6,"start":346822,"end":346870},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1235,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32553}],"down_context":[{"change":6,"pos":346896}],"flag":"BLOCK","start":45597,"end":45619,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1241,"ins":{"up_context":[{"change":6,"pos":346990}],"down_context":[{"change":6,"pos":347284}],"flag":"BLOCK","start":45620,"end":45805,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":346990},"to":{"change":6,"start":346990,"end":347196},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347196},"to":{"change":6,"start":13828,"end":13909},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice"},{"Add":" .write()"},{"Add":" .move_file(\"file\", \"alice/file\", 0)"},{"Add":" .unwrap_or(());"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.move_file(\"file\", \"alice/file\").unwrap_or(());\n let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1249,"ins":{"up_context":[{"change":6,"pos":347359}],"down_context":[{"change":6,"pos":347513}],"flag":"BLOCK","start":45806,"end":45884,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347359},"to":{"change":6,"start":347359,"end":347449},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347449},"to":{"change":6,"start":13910,"end":13985},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1254,"ins":{"up_context":[{"change":6,"pos":347602}],"down_context":[{"change":6,"pos":347661}],"flag":"BLOCK","start":45885,"end":45971,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347602},"to":{"change":6,"start":32554,"end":32614},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &alice_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, &alice_h)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1257,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347680},"to":{"change":6,"start":13986,"end":14061},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1258,"ins":{"up_context":[{"change":6,"pos":347802}],"down_context":[{"change":6,"pos":347825}],"flag":"BLOCK","start":45972,"end":45991,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347802},"to":{"change":6,"start":347802,"end":347825},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1260,"ins":{"up_context":[{"change":6,"pos":347843}],"down_context":[{"change":6,"pos":347891}],"flag":"BLOCK","start":45992,"end":46032,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":347843},"to":{"change":6,"start":347843,"end":347891},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1265,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32629}],"down_context":[{"change":6,"pos":347917}],"flag":"BLOCK","start":46033,"end":46055,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1280,"ins":{"up_context":[{"change":6,"pos":348369}],"down_context":[{"change":6,"pos":348528}],"flag":"BLOCK","start":46056,"end":46139,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":348369},"to":{"change":6,"start":348369,"end":348464},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":348464},"to":{"change":6,"start":14062,"end":14137},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let resolution = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1282,"ins":{"up_context":[{"change":6,"pos":348586}],"down_context":[{"change":6,"pos":348609}],"flag":"BLOCK","start":46140,"end":46159,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":348586},"to":{"change":6,"start":348586,"end":348609},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1284,"ins":{"up_context":[{"change":6,"pos":348627}],"down_context":[{"change":6,"pos":348675}],"flag":"BLOCK","start":46160,"end":46200,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":348627},"to":{"change":6,"start":348627,"end":348675},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1289,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32644}],"down_context":[{"change":6,"pos":348701}],"flag":"BLOCK","start":46201,"end":46223,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1299,"ins":{"up_context":[{"change":6,"pos":348891}],"down_context":[{"change":6,"pos":349038}],"flag":"BLOCK","start":46224,"end":46310,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":348891},"to":{"change":6,"start":32645,"end":32705},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_alice.write(), &bob_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, &bob_h)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1302,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349057},"to":{"change":6,"start":14138,"end":14219},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1303,"ins":{"up_context":[{"change":6,"pos":349115}],"down_context":[{"change":6,"pos":349140}],"flag":"BLOCK","start":46311,"end":46332,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349115},"to":{"change":6,"start":349115,"end":349140},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1305,"ins":{"up_context":[{"change":6,"pos":349158}],"down_context":[{"change":6,"pos":349210}],"flag":"BLOCK","start":46333,"end":46377,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349158},"to":{"change":6,"start":349158,"end":349210},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1310,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32720}],"down_context":[{"change":6,"pos":349236}],"flag":"BLOCK","start":46378,"end":46400,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1320,"ins":{"up_context":[{"change":6,"pos":349505}],"down_context":[{"change":6,"pos":349569}],"flag":"BLOCK","start":46401,"end":46492,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349505},"to":{"change":6,"start":32721,"end":32786},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_alice.write(), &resolution)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, &resolution)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1324,"ins":{"up_context":[{"change":6,"pos":349646}],"down_context":[{"change":6,"pos":349671}],"flag":"BLOCK","start":46493,"end":46514,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349646},"to":{"change":6,"start":349646,"end":349671},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1326,"ins":{"up_context":[{"change":6,"pos":349689}],"down_context":[{"change":6,"pos":349741}],"flag":"BLOCK","start":46515,"end":46559,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349689},"to":{"change":6,"start":349689,"end":349741},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1331,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32801}],"down_context":[{"change":6,"pos":349767}],"flag":"BLOCK","start":46560,"end":46582,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1334,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":349775},"to":{"change":6,"start":14220,"end":14301},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1347,"ins":{"up_context":[{"change":6,"pos":350193}],"down_context":[{"change":6,"pos":350315}],"flag":"BLOCK","start":46583,"end":46697,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350193},"to":{"change":6,"start":350193,"end":350315},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1351,"ins":{"up_context":[{"change":6,"pos":350433}],"down_context":[{"change":6,"pos":350555}],"flag":"BLOCK","start":46698,"end":46829,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350433},"to":{"change":6,"start":33917,"end":33977},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33977},"to":{"change":6,"start":350484,"end":350555},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350484},"to":{"change":6,"start":350484,"end":350555},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1354,"ins":{"up_context":[{"change":6,"pos":350614}],"down_context":[{"change":6,"pos":350789}],"flag":"BLOCK","start":46830,"end":46957,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350614},"to":{"change":6,"start":350614,"end":350789},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file\", 0)?;"},{"Add":" let init = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"file\")?;\n let init = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1358,"ins":{"up_context":[{"change":6,"pos":350852}],"down_context":[{"change":6,"pos":350966}],"flag":"BLOCK","start":46958,"end":47081,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350852},"to":{"change":6,"start":33978,"end":34034},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34034},"to":{"change":6,"start":350899,"end":350966},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350899},"to":{"change":6,"start":350899,"end":350966},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1361,"ins":{"up_context":[{"change":6,"pos":350978}],"down_context":[{"change":6,"pos":351034}],"flag":"BLOCK","start":47082,"end":47165,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":350978},"to":{"change":6,"start":32802,"end":32859},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &init)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, &init)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1365,"ins":{"up_context":[{"change":6,"pos":351095}],"down_context":[{"change":6,"pos":351118}],"flag":"BLOCK","start":47166,"end":47185,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351095},"to":{"change":6,"start":351095,"end":351118},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1367,"ins":{"up_context":[{"change":6,"pos":351136}],"down_context":[{"change":6,"pos":351184}],"flag":"BLOCK","start":47186,"end":47226,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351136},"to":{"change":6,"start":351136,"end":351184},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1372,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":32874}],"down_context":[{"change":6,"pos":351210}],"flag":"BLOCK","start":47227,"end":47249,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1377,"ins":{"up_context":[{"change":6,"pos":351252}],"down_context":[{"change":6,"pos":351577}],"flag":"BLOCK","start":47250,"end":47424,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351252},"to":{"change":6,"start":3353,"end":3417},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3417},"to":{"change":6,"start":351292,"end":351489},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351292},"to":{"change":6,"start":351292,"end":351489},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351489},"to":{"change":6,"start":14302,"end":14383},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\nb\\nx\\nc\\nd\\n\")?;"},{"Add":" record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"a\\nb\\nx\\nc\\nd\\n\")?;\n Ok(())\n })?;\n record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1385,"ins":{"up_context":[{"change":6,"pos":351662}],"down_context":[{"change":6,"pos":351912}],"flag":"BLOCK","start":47425,"end":47568,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351662},"to":{"change":6,"start":3418,"end":3480},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3480},"to":{"change":6,"start":351700,"end":351848},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351700},"to":{"change":6,"start":351700,"end":351848},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351848},"to":{"change":6,"start":14384,"end":14459},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(b\"a\\nd\\n\")?;"},{"Add":" let bob_h1 = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"a\\nd\\n\")?;\n Ok(())\n })?;\n let bob_h1 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1388,"ins":{"up_context":[{"change":6,"pos":351960}],"down_context":[{"change":6,"pos":352115}],"flag":"BLOCK","start":47569,"end":47648,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":351960},"to":{"change":6,"start":351960,"end":352051},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352051},"to":{"change":6,"start":14460,"end":14535},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h2 = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let bob_h2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1393,"ins":{"up_context":[{"change":6,"pos":352208}],"down_context":[{"change":6,"pos":352356}],"flag":"BLOCK","start":47649,"end":47736,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352208},"to":{"change":6,"start":32875,"end":32936},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_alice.write(), &bob_h1)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, &bob_h1)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1396,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352375},"to":{"change":6,"start":14536,"end":14617},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1398,"ins":{"up_context":[{"change":6,"pos":352420}],"down_context":[{"change":6,"pos":352568}],"flag":"BLOCK","start":47737,"end":47824,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352420},"to":{"change":6,"start":32937,"end":32998},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_alice.write(), &bob_h2)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, &bob_h2)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1401,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352587},"to":{"change":6,"start":14618,"end":14699},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1402,"ins":{"up_context":[{"change":6,"pos":352588}],"down_context":[{"change":6,"pos":352656}],"flag":"BLOCK","start":47825,"end":47916,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352588},"to":{"change":6,"start":28692,"end":28777},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&*txn_alice.read(), &channel_alice.read().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn_alice, &channel_alice.borrow().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1410,"ins":{"up_context":[{"change":6,"pos":352825}],"down_context":[{"change":6,"pos":353008}],"flag":"BLOCK","start":47917,"end":48072,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352825},"to":{"change":6,"start":352825,"end":352920},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":352920},"to":{"change":6,"start":14700,"end":14781},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" crate::unrecord::unrecord("},{"Add":" &mut *txn_alice.write(),"},{"Add":" &channel_alice,"},{"Add":" &changes,"},{"Add":" &bob_h2,"},{"Add":" 0,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut txn_alice, &mut channel_alice, &changes, &bob_h2).unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice4\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1419,"ins":{"up_context":[{"change":6,"pos":353050}],"down_context":[{"change":6,"pos":353075}],"flag":"BLOCK","start":48073,"end":48094,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":353050},"to":{"change":6,"start":353050,"end":353075},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1421,"ins":{"up_context":[{"change":6,"pos":353093}],"down_context":[{"change":6,"pos":353145}],"flag":"BLOCK","start":48095,"end":48139,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":353093},"to":{"change":6,"start":353093,"end":353145},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1426,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33013}],"down_context":[{"change":6,"pos":353171}],"flag":"BLOCK","start":48140,"end":48162,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1439,"ins":{"up_context":[{"change":6,"pos":353432}],"down_context":[{"change":6,"pos":353494}],"flag":"BLOCK","start":48163,"end":48221,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":353432},"to":{"change":6,"start":353432,"end":353494},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1443,"ins":{"up_context":[{"change":6,"pos":353672}],"down_context":[{"change":6,"pos":353794}],"flag":"BLOCK","start":48222,"end":48353,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":353672},"to":{"change":6,"start":34035,"end":34095},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34095},"to":{"change":6,"start":353723,"end":353794},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":353723},"to":{"change":6,"start":353723,"end":353794},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1447,"ins":{"up_context":[{"change":6,"pos":353875}],"down_context":[{"change":6,"pos":354081}],"flag":"BLOCK","start":48354,"end":48523,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":353875},"to":{"change":6,"start":353875,"end":354081},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file\", 0)?;"},{"Add":" txn_alice.write().add_dir(\"dir\", 0)?;"},{"Add":" let init = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.add_file(\"file\")?;\n txn_alice.add_dir(\"dir\")?;\n let init = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1452,"ins":{"up_context":[{"change":6,"pos":354144}],"down_context":[{"change":6,"pos":354258}],"flag":"BLOCK","start":48524,"end":48655,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":354144},"to":{"change":6,"start":34096,"end":34152},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34152},"to":{"change":6,"start":354191,"end":354258},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":354191},"to":{"change":6,"start":354191,"end":354258},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let mut txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let mut channel_bob = txn_bob.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1455,"ins":{"up_context":[{"change":6,"pos":354270}],"down_context":[{"change":6,"pos":354326}],"flag":"BLOCK","start":48656,"end":48739,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":354270},"to":{"change":6,"start":33014,"end":33071},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &init)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, &init)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1466,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33086}],"down_context":[{"change":6,"pos":354502}],"flag":"BLOCK","start":48740,"end":48762,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1472,"ins":{"up_context":[{"change":6,"pos":354594}],"down_context":[{"change":6,"pos":354886}],"flag":"BLOCK","start":48763,"end":48946,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":354594},"to":{"change":6,"start":354594,"end":354798},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":354798},"to":{"change":6,"start":14782,"end":14863},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" txn_alice"},{"Add":" .write()"},{"Add":" .move_file(\"file\", \"dir/file\", 0)"},{"Add":" .unwrap_or(());"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" txn_alice.move_file(\"file\", \"dir/file\").unwrap_or(());\n let alice_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1480,"ins":{"up_context":[{"change":6,"pos":354959}],"down_context":[{"change":6,"pos":355113}],"flag":"BLOCK","start":48947,"end":49025,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":354959},"to":{"change":6,"start":354959,"end":355049},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355049},"to":{"change":6,"start":14864,"end":14939},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1485,"ins":{"up_context":[{"change":6,"pos":355202}],"down_context":[{"change":6,"pos":355261}],"flag":"BLOCK","start":49026,"end":49112,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355202},"to":{"change":6,"start":33087,"end":33147},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &alice_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_bob, &alice_h)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1488,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355280},"to":{"change":6,"start":14940,"end":15015},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1489,"ins":{"up_context":[{"change":6,"pos":355402}],"down_context":[{"change":6,"pos":355425}],"flag":"BLOCK","start":49113,"end":49132,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355402},"to":{"change":6,"start":355402,"end":355425},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1491,"ins":{"up_context":[{"change":6,"pos":355443}],"down_context":[{"change":6,"pos":355491}],"flag":"BLOCK","start":49133,"end":49173,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355443},"to":{"change":6,"start":355443,"end":355491},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1496,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33162}],"down_context":[{"change":6,"pos":355517}],"flag":"BLOCK","start":49174,"end":49196,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1505,"ins":{"up_context":[{"change":6,"pos":355763}],"down_context":[{"change":6,"pos":355922}],"flag":"BLOCK","start":49197,"end":49280,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355763},"to":{"change":6,"start":355763,"end":355858},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355858},"to":{"change":6,"start":15016,"end":15091},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" let resolution = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1507,"ins":{"up_context":[{"change":6,"pos":355980}],"down_context":[{"change":6,"pos":356003}],"flag":"BLOCK","start":49281,"end":49300,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":355980},"to":{"change":6,"start":355980,"end":356003},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1509,"ins":{"up_context":[{"change":6,"pos":356021}],"down_context":[{"change":6,"pos":356069}],"flag":"BLOCK","start":49301,"end":49341,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":356021},"to":{"change":6,"start":356021,"end":356069},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1514,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33177}],"down_context":[{"change":6,"pos":356095}],"flag":"BLOCK","start":49342,"end":49364,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1524,"ins":{"up_context":[{"change":6,"pos":356285}],"down_context":[{"change":6,"pos":356344}],"flag":"BLOCK","start":49365,"end":49451,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":356285},"to":{"change":6,"start":33178,"end":33238},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_alice.write(), &bob_h)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, &bob_h)\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1527,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":356363},"to":{"change":6,"start":15092,"end":15173},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1528,"ins":{"up_context":[{"change":6,"pos":356509}],"down_context":[{"change":6,"pos":356534}],"flag":"BLOCK","start":49452,"end":49473,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":356509},"to":{"change":6,"start":356509,"end":356534},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1530,"ins":{"up_context":[{"change":6,"pos":356552}],"down_context":[{"change":6,"pos":356604}],"flag":"BLOCK","start":49474,"end":49518,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":356552},"to":{"change":6,"start":356552,"end":356604},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1535,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33253}],"down_context":[{"change":6,"pos":356630}],"flag":"BLOCK","start":49519,"end":49541,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1545,"ins":{"up_context":[{"change":6,"pos":356892}],"down_context":[{"change":6,"pos":356956}],"flag":"BLOCK","start":49542,"end":49633,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":356892},"to":{"change":6,"start":33254,"end":33319},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" .write()"},{"Add":" .apply_change(&changes, &mut *channel_alice.write(), &resolution)"}],"del_contents":[{"Del":" .apply_change(&changes, &mut channel_alice, &resolution)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1549,"ins":{"up_context":[{"change":6,"pos":357033}],"down_context":[{"change":6,"pos":357058}],"flag":"BLOCK","start":49634,"end":49655,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":357033},"to":{"change":6,"start":357033,"end":357058},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1551,"ins":{"up_context":[{"change":6,"pos":357076}],"down_context":[{"change":6,"pos":357128}],"flag":"BLOCK","start":49656,"end":49700,"inode":{"change":6,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":357076},"to":{"change":6,"start":357076,"end":357128},"introduced_by":6}],"inode":{"change":6,"pos":305506}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1556,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33334}],"down_context":[{"change":6,"pos":357154}],"flag":"BLOCK","start":49701,"end":49723,"inode":{"change":6,"pos":305506}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1559,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":357162},"to":{"change":6,"start":15174,"end":15255},"introduced_by":6}],"inode":{"change":6,"pos":305506}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice3\").unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":357442}],"down_context":[{"change":6,"pos":357442}],"flag":"BLOCK","start":49724,"end":49744,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":12,"ins":{"up_context":[{"change":6,"pos":357652}],"down_context":[{"change":6,"pos":357714}],"flag":"BLOCK","start":49745,"end":49803,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":357652},"to":{"change":6,"start":357652,"end":357714},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":17,"ins":{"up_context":[{"change":6,"pos":357879}],"down_context":[{"change":6,"pos":358164}],"flag":"BLOCK","start":49804,"end":50035,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":357879},"to":{"change":6,"start":34153,"end":34201},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34201},"to":{"change":6,"start":357918,"end":358102},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":357918},"to":{"change":6,"start":357918,"end":358102},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358102},"to":{"change":6,"start":15256,"end":15329},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":23,"ins":{"up_context":[{"change":6,"pos":358183}],"down_context":[{"change":6,"pos":358377}],"flag":"BLOCK","start":50036,"end":50288,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358183},"to":{"change":6,"start":358183,"end":358305},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358305},"to":{"change":6,"start":33335,"end":33408},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &init_h,"},{"Add":" )?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":32,"ins":{"up_context":[{"change":6,"pos":358419}],"down_context":[{"change":6,"pos":358442}],"flag":"BLOCK","start":50289,"end":50308,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358419},"to":{"change":6,"start":358419,"end":358442},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":34,"ins":{"up_context":[{"change":6,"pos":358460}],"down_context":[{"change":6,"pos":358504}],"flag":"BLOCK","start":50309,"end":50345,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358460},"to":{"change":6,"start":358460,"end":358504},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":39,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33423}],"down_context":[{"change":6,"pos":358530}],"flag":"BLOCK","start":50346,"end":50368,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":50,"ins":{"up_context":[{"change":6,"pos":358774}],"down_context":[{"change":6,"pos":359139}],"flag":"BLOCK","start":50369,"end":50509,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358774},"to":{"change":6,"start":3481,"end":3543},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3543},"to":{"change":6,"start":358812,"end":358871},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358812},"to":{"change":6,"start":358812,"end":358871},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358871},"to":{"change":6,"start":15330,"end":15474},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":15474},"to":{"change":6,"start":358993,"end":359079},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":22456},"to":{"change":6,"start":358993,"end":359079},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":358993},"to":{"change":6,"start":358993,"end":359079},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359079},"to":{"change":6,"start":15475,"end":15546},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":54,"ins":{"up_context":[{"change":6,"pos":359171}],"down_context":[{"change":6,"pos":359428}],"flag":"BLOCK","start":50510,"end":50696,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359171},"to":{"change":6,"start":3544,"end":3608},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3608},"to":{"change":6,"start":359211,"end":359364},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359211},"to":{"change":6,"start":359211,"end":359364},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359364},"to":{"change":6,"start":15547,"end":15622},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":62,"ins":{"up_context":[{"change":6,"pos":359463}],"down_context":[{"change":6,"pos":359536}],"flag":"BLOCK","start":50697,"end":50828,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359463},"to":{"change":6,"start":33424,"end":33498},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_alice.write(),"},{"Add":" &bob_h,"},{"Add":" )?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":69,"ins":{"up_context":[{"change":6,"pos":359578}],"down_context":[{"change":6,"pos":359603}],"flag":"BLOCK","start":50829,"end":50850,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359578},"to":{"change":6,"start":359578,"end":359603},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":71,"ins":{"up_context":[{"change":6,"pos":359621}],"down_context":[{"change":6,"pos":359667}],"flag":"BLOCK","start":50851,"end":50889,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":359621},"to":{"change":6,"start":359621,"end":359667},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":76,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33513}],"down_context":[{"change":6,"pos":359693}],"flag":"BLOCK","start":50890,"end":50912,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":107,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":360561},"to":{"change":6,"start":360561,"end":360591},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":360591},"to":{"change":6,"start":15623,"end":15698},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" // check_conflict(&buf)?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":110,"ins":{"up_context":[{"change":6,"pos":360763}],"down_context":[{"change":6,"pos":360803}],"flag":"BLOCK","start":50913,"end":50979,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":360763},"to":{"change":6,"start":3609,"end":3673},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":121,"ins":{"up_context":[{"change":6,"pos":361136}],"down_context":[{"change":6,"pos":361160}],"flag":"BLOCK","start":50980,"end":50986,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361136},"to":{"change":6,"start":361136,"end":361160},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":123,"ins":{"up_context":[{"change":6,"pos":361184}],"down_context":[{"change":6,"pos":361343}],"flag":"BLOCK","start":50987,"end":51070,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361184},"to":{"change":6,"start":361184,"end":361279},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361279},"to":{"change":6,"start":15699,"end":15774},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":126,"ins":{"up_context":[{"change":6,"pos":361378}],"down_context":[{"change":6,"pos":361459}],"flag":"BLOCK","start":51071,"end":51215,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361378},"to":{"change":6,"start":33514,"end":33596},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &alice_h,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":134,"ins":{"up_context":[{"change":6,"pos":361501}],"down_context":[{"change":6,"pos":361524}],"flag":"BLOCK","start":51216,"end":51235,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361501},"to":{"change":6,"start":361501,"end":361524},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":136,"ins":{"up_context":[{"change":6,"pos":361542}],"down_context":[{"change":6,"pos":361586}],"flag":"BLOCK","start":51236,"end":51272,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361542},"to":{"change":6,"start":361542,"end":361586},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":141,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33611}],"down_context":[{"change":6,"pos":361612}],"flag":"BLOCK","start":51273,"end":51295,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":144,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361620},"to":{"change":6,"start":15775,"end":15846},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":149,"ins":{"up_context":[{"change":6,"pos":361806}],"down_context":[{"change":6,"pos":361890}],"flag":"BLOCK","start":51296,"end":51443,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361806},"to":{"change":6,"start":33612,"end":33697},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &resolution,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":157,"ins":{"up_context":[{"change":6,"pos":361932}],"down_context":[{"change":6,"pos":361955}],"flag":"BLOCK","start":51444,"end":51463,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361932},"to":{"change":6,"start":361932,"end":361955},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":159,"ins":{"up_context":[{"change":6,"pos":361973}],"down_context":[{"change":6,"pos":362017}],"flag":"BLOCK","start":51464,"end":51500,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":361973},"to":{"change":6,"start":361973,"end":362017},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":164,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33712}],"down_context":[{"change":6,"pos":362043}],"flag":"BLOCK","start":51501,"end":51523,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":167,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":362051},"to":{"change":6,"start":15847,"end":15918},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":171,"ins":{"up_context":[{"change":6,"pos":362243}],"down_context":[{"change":6,"pos":362394}],"flag":"BLOCK","start":51524,"end":51623,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":362243},"to":{"change":6,"start":362243,"end":362334},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":362334},"to":{"change":6,"start":15919,"end":15990},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" crate::unrecord::unrecord(&mut *txn.write(), &channel_bob, &changes, &resolution, 0).unwrap();"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut txn, &mut channel_bob, &changes, &resolution).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":173,"ins":{"up_context":[{"change":6,"pos":362436}],"down_context":[{"change":6,"pos":362459}],"flag":"BLOCK","start":51624,"end":51643,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":362436},"to":{"change":6,"start":362436,"end":362459},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":175,"ins":{"up_context":[{"change":6,"pos":362477}],"down_context":[{"change":6,"pos":362521}],"flag":"BLOCK","start":51644,"end":51680,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":362477},"to":{"change":6,"start":362477,"end":362521},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":180,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33727}],"down_context":[{"change":6,"pos":362547}],"flag":"BLOCK","start":51681,"end":51703,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":197,"ins":{"up_context":[{"change":6,"pos":362940}],"down_context":[{"change":6,"pos":363002}],"flag":"BLOCK","start":51704,"end":51762,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":362940},"to":{"change":6,"start":362940,"end":363002},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":202,"ins":{"up_context":[{"change":6,"pos":363167}],"down_context":[{"change":6,"pos":363452}],"flag":"BLOCK","start":51763,"end":51994,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363167},"to":{"change":6,"start":34202,"end":34250},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34250},"to":{"change":6,"start":363206,"end":363390},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363206},"to":{"change":6,"start":363206,"end":363390},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363390},"to":{"change":6,"start":15991,"end":16064},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":209,"ins":{"up_context":[{"change":6,"pos":363531}],"down_context":[{"change":6,"pos":363665}],"flag":"BLOCK","start":51995,"end":52191,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363531},"to":{"change":6,"start":363531,"end":363593},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363593},"to":{"change":6,"start":33728,"end":33801},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &init_h,"},{"Add":" )?;"}],"del_contents":[{"Del":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":217,"ins":{"up_context":[{"change":6,"pos":363707}],"down_context":[{"change":6,"pos":363730}],"flag":"BLOCK","start":52192,"end":52211,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363707},"to":{"change":6,"start":363707,"end":363730},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":219,"ins":{"up_context":[{"change":6,"pos":363748}],"down_context":[{"change":6,"pos":363792}],"flag":"BLOCK","start":52212,"end":52248,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":363748},"to":{"change":6,"start":363748,"end":363792},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":224,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33816}],"down_context":[{"change":6,"pos":363818}],"flag":"BLOCK","start":52249,"end":52271,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":235,"ins":{"up_context":[{"change":6,"pos":364055}],"down_context":[{"change":6,"pos":364265}],"flag":"BLOCK","start":52272,"end":52540,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364055},"to":{"change":6,"start":364055,"end":364189},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364189},"to":{"change":6,"start":33817,"end":33894},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let channel_charlie = txn.write().open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_charlie.write(),"},{"Add":" &init_h,"},{"Add":" )?;"}],"del_contents":[{"Del":" let mut repo_charlie = working_copy::memory::Memory::new();\n let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":244,"ins":{"up_context":[{"change":6,"pos":364307}],"down_context":[{"change":6,"pos":364334}],"flag":"BLOCK","start":52541,"end":52564,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364307},"to":{"change":6,"start":364307,"end":364334},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":246,"ins":{"up_context":[{"change":6,"pos":364352}],"down_context":[{"change":6,"pos":364400}],"flag":"BLOCK","start":52565,"end":52605,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364352},"to":{"change":6,"start":364352,"end":364400},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":251,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33909}],"down_context":[{"change":6,"pos":364426}],"flag":"BLOCK","start":52606,"end":52628,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":256,"ins":{"up_context":[{"change":6,"pos":364464}],"down_context":[{"change":6,"pos":364829}],"flag":"BLOCK","start":52629,"end":52769,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364464},"to":{"change":6,"start":3674,"end":3736},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3736},"to":{"change":6,"start":364502,"end":364561},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364502},"to":{"change":6,"start":364502,"end":364561},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364561},"to":{"change":6,"start":16065,"end":16209},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16209},"to":{"change":6,"start":364683,"end":364769},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":23101},"to":{"change":6,"start":364683,"end":364769},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364683},"to":{"change":6,"start":364683,"end":364769},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364769},"to":{"change":6,"start":16210,"end":16281},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":260,"ins":{"up_context":[{"change":6,"pos":364863}],"down_context":[{"change":6,"pos":365190}],"flag":"BLOCK","start":52770,"end":52966,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364863},"to":{"change":6,"start":3737,"end":3803},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3803},"to":{"change":6,"start":364905,"end":365113},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":364905},"to":{"change":6,"start":364905,"end":365113},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365113},"to":{"change":6,"start":16282,"end":16361},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_charlie"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(charlie)"},{"Add":" .unwrap();"},{"Add":" let charlie_h = record_all(&repo_charlie, &changes, &txn, &channel_charlie, \"\")?;"}],"del_contents":[{"Del":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(charlie).unwrap();\n Ok(())\n })?;\n let charlie_h = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn,\n &mut channel_charlie,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":268,"ins":{"up_context":[{"change":6,"pos":365222}],"down_context":[{"change":6,"pos":365479}],"flag":"BLOCK","start":52967,"end":53153,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365222},"to":{"change":6,"start":3804,"end":3868},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3868},"to":{"change":6,"start":365262,"end":365415},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365262},"to":{"change":6,"start":365262,"end":365415},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365415},"to":{"change":6,"start":16362,"end":16437},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":276,"ins":{"up_context":[{"change":6,"pos":365514}],"down_context":[{"change":6,"pos":365587}],"flag":"BLOCK","start":53154,"end":53285,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365514},"to":{"change":6,"start":33910,"end":33984},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_alice.write(),"},{"Add":" &bob_h,"},{"Add":" )?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":283,"ins":{"up_context":[{"change":6,"pos":365629}],"down_context":[{"change":6,"pos":365654}],"flag":"BLOCK","start":53286,"end":53307,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365629},"to":{"change":6,"start":365629,"end":365654},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":285,"ins":{"up_context":[{"change":6,"pos":365672}],"down_context":[{"change":6,"pos":365718}],"flag":"BLOCK","start":53308,"end":53346,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":365672},"to":{"change":6,"start":365672,"end":365718},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":290,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":33999}],"down_context":[{"change":6,"pos":365744}],"flag":"BLOCK","start":53347,"end":53369,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":320,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":366623},"to":{"change":6,"start":16438,"end":16513},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":323,"ins":{"up_context":[{"change":6,"pos":366795}],"down_context":[{"change":6,"pos":366835}],"flag":"BLOCK","start":53370,"end":53436,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":366795},"to":{"change":6,"start":3869,"end":3933},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":328,"ins":{"up_context":[{"change":6,"pos":366939}],"down_context":[{"change":6,"pos":366963}],"flag":"BLOCK","start":53437,"end":53443,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":366939},"to":{"change":6,"start":366939,"end":366963},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":332,"ins":{"up_context":[{"change":6,"pos":367088}],"down_context":[{"change":6,"pos":367247}],"flag":"BLOCK","start":53444,"end":53527,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367088},"to":{"change":6,"start":367088,"end":367183},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367183},"to":{"change":6,"start":16514,"end":16589},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":335,"ins":{"up_context":[{"change":6,"pos":367282}],"down_context":[{"change":6,"pos":367446}],"flag":"BLOCK","start":53528,"end":53818,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367282},"to":{"change":6,"start":34000,"end":34166},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &alice_h,"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &charlie_h,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_bob, &charlie_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":350,"ins":{"up_context":[{"change":6,"pos":367488}],"down_context":[{"change":6,"pos":367511}],"flag":"BLOCK","start":53819,"end":53838,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367488},"to":{"change":6,"start":367488,"end":367511},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":352,"ins":{"up_context":[{"change":6,"pos":367529}],"down_context":[{"change":6,"pos":367573}],"flag":"BLOCK","start":53839,"end":53875,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367529},"to":{"change":6,"start":367529,"end":367573},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":357,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34181}],"down_context":[{"change":6,"pos":367599}],"flag":"BLOCK","start":53876,"end":53898,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":360,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367607},"to":{"change":6,"start":16590,"end":16661},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":364,"ins":{"up_context":[{"change":6,"pos":367755}],"down_context":[{"change":6,"pos":367839}],"flag":"BLOCK","start":53899,"end":54046,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367755},"to":{"change":6,"start":34182,"end":34267},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change("},{"Add":" &changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel_bob.write(),"},{"Add":" &resolution,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":372,"ins":{"up_context":[{"change":6,"pos":367881}],"down_context":[{"change":6,"pos":367904}],"flag":"BLOCK","start":54047,"end":54066,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367881},"to":{"change":6,"start":367881,"end":367904},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":374,"ins":{"up_context":[{"change":6,"pos":367922}],"down_context":[{"change":6,"pos":367966}],"flag":"BLOCK","start":54067,"end":54103,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":367922},"to":{"change":6,"start":367922,"end":367966},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":379,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34282}],"down_context":[{"change":6,"pos":367992}],"flag":"BLOCK","start":54104,"end":54126,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":402,"ins":{"up_context":[{"change":6,"pos":368608}],"down_context":[{"change":6,"pos":368646}],"flag":"BLOCK","start":54127,"end":54191,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":368608},"to":{"change":6,"start":3934,"end":3996},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_bob.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":407,"ins":{"up_context":[{"change":6,"pos":368750}],"down_context":[{"change":6,"pos":368774}],"flag":"BLOCK","start":54192,"end":54198,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":368750},"to":{"change":6,"start":368750,"end":368774},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":411,"ins":{"up_context":[{"change":6,"pos":368893}],"down_context":[{"change":6,"pos":368985}],"flag":"BLOCK","start":54199,"end":54283,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":368893},"to":{"change":6,"start":368893,"end":368985},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution2 = record_all(&mut repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let resolution2 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":414,"ins":{"up_context":[{"change":6,"pos":369024}],"down_context":[{"change":6,"pos":369192}],"flag":"BLOCK","start":54284,"end":54446,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369024},"to":{"change":6,"start":34283,"end":34453},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &alice_h).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &bob_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":417,"ins":{"up_context":[{"change":6,"pos":369234}],"down_context":[{"change":6,"pos":369261}],"flag":"BLOCK","start":54447,"end":54470,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369234},"to":{"change":6,"start":369234,"end":369261},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":419,"ins":{"up_context":[{"change":6,"pos":369279}],"down_context":[{"change":6,"pos":369327}],"flag":"BLOCK","start":54471,"end":54511,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369279},"to":{"change":6,"start":369279,"end":369327},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":424,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34468}],"down_context":[{"change":6,"pos":369353}],"flag":"BLOCK","start":54512,"end":54534,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":427,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369361},"to":{"change":6,"start":16662,"end":16741},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":431,"ins":{"up_context":[{"change":6,"pos":369530}],"down_context":[{"change":6,"pos":369707}],"flag":"BLOCK","start":54535,"end":54706,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369530},"to":{"change":6,"start":34469,"end":34648},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &resolution).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &resolution2).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &resolution).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &resolution2).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":434,"ins":{"up_context":[{"change":6,"pos":369749}],"down_context":[{"change":6,"pos":369776}],"flag":"BLOCK","start":54707,"end":54730,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369749},"to":{"change":6,"start":369749,"end":369776},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":436,"ins":{"up_context":[{"change":6,"pos":369794}],"down_context":[{"change":6,"pos":369842}],"flag":"BLOCK","start":54731,"end":54771,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":369794},"to":{"change":6,"start":369794,"end":369842},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":441,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34663}],"down_context":[{"change":6,"pos":369868}],"flag":"BLOCK","start":54772,"end":54794,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":467,"ins":{"up_context":[{"change":6,"pos":370487}],"down_context":[{"change":6,"pos":370772}],"flag":"BLOCK","start":54795,"end":55026,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":370487},"to":{"change":6,"start":34251,"end":34299},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34299},"to":{"change":6,"start":370526,"end":370710},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":370526},"to":{"change":6,"start":370526,"end":370710},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":370710},"to":{"change":6,"start":16742,"end":16815},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":473,"ins":{"up_context":[{"change":6,"pos":370791}],"down_context":[{"change":6,"pos":370985}],"flag":"BLOCK","start":55027,"end":55218,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":370791},"to":{"change":6,"start":370791,"end":370913},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":370913},"to":{"change":6,"start":34664,"end":34737},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":477,"ins":{"up_context":[{"change":6,"pos":371027}],"down_context":[{"change":6,"pos":371050}],"flag":"BLOCK","start":55219,"end":55238,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371027},"to":{"change":6,"start":371027,"end":371050},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":479,"ins":{"up_context":[{"change":6,"pos":371068}],"down_context":[{"change":6,"pos":371112}],"flag":"BLOCK","start":55239,"end":55275,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371068},"to":{"change":6,"start":371068,"end":371112},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":484,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34752}],"down_context":[{"change":6,"pos":371138}],"flag":"BLOCK","start":55276,"end":55298,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":490,"ins":{"up_context":[{"change":6,"pos":371225}],"down_context":[{"change":6,"pos":371590}],"flag":"BLOCK","start":55299,"end":55439,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371225},"to":{"change":6,"start":3997,"end":4059},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4059},"to":{"change":6,"start":371263,"end":371322},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371263},"to":{"change":6,"start":371263,"end":371322},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371322},"to":{"change":6,"start":16816,"end":16960},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":16960},"to":{"change":6,"start":371444,"end":371530},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":23762},"to":{"change":6,"start":371444,"end":371530},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371444},"to":{"change":6,"start":371444,"end":371530},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371530},"to":{"change":6,"start":16961,"end":17032},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":494,"ins":{"up_context":[{"change":6,"pos":371622}],"down_context":[{"change":6,"pos":371879}],"flag":"BLOCK","start":55440,"end":55626,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371622},"to":{"change":6,"start":4060,"end":4124},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4124},"to":{"change":6,"start":371662,"end":371815},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371662},"to":{"change":6,"start":371662,"end":371815},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371815},"to":{"change":6,"start":17033,"end":17108},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":502,"ins":{"up_context":[{"change":6,"pos":371914}],"down_context":[{"change":6,"pos":371987}],"flag":"BLOCK","start":55627,"end":55697,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":371914},"to":{"change":6,"start":34753,"end":34827},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":504,"ins":{"up_context":[{"change":6,"pos":372029}],"down_context":[{"change":6,"pos":372054}],"flag":"BLOCK","start":55698,"end":55719,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":372029},"to":{"change":6,"start":372029,"end":372054},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":506,"ins":{"up_context":[{"change":6,"pos":372072}],"down_context":[{"change":6,"pos":372118}],"flag":"BLOCK","start":55720,"end":55758,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":372072},"to":{"change":6,"start":372072,"end":372118},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":511,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34842}],"down_context":[{"change":6,"pos":372144}],"flag":"BLOCK","start":55759,"end":55781,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":514,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":372152},"to":{"change":6,"start":17109,"end":17184},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":520,"ins":{"up_context":[{"change":6,"pos":372428}],"down_context":[{"change":6,"pos":372468}],"flag":"BLOCK","start":55782,"end":55848,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":372428},"to":{"change":6,"start":4125,"end":4189},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":535,"ins":{"up_context":[{"change":6,"pos":372850}],"down_context":[{"change":6,"pos":372874}],"flag":"BLOCK","start":55849,"end":55855,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":372850},"to":{"change":6,"start":372850,"end":372874},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":539,"ins":{"up_context":[{"change":6,"pos":373044}],"down_context":[{"change":6,"pos":373203}],"flag":"BLOCK","start":55856,"end":55943,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373044},"to":{"change":6,"start":373044,"end":373139},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373139},"to":{"change":6,"start":17185,"end":17260},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&mut repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":542,"ins":{"up_context":[{"change":6,"pos":373238}],"down_context":[{"change":6,"pos":373319}],"flag":"BLOCK","start":55944,"end":56022,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373238},"to":{"change":6,"start":34843,"end":34925},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":544,"ins":{"up_context":[{"change":6,"pos":373361}],"down_context":[{"change":6,"pos":373384}],"flag":"BLOCK","start":56023,"end":56042,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373361},"to":{"change":6,"start":373361,"end":373384},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":546,"ins":{"up_context":[{"change":6,"pos":373402}],"down_context":[{"change":6,"pos":373446}],"flag":"BLOCK","start":56043,"end":56079,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373402},"to":{"change":6,"start":373402,"end":373446},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":551,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":34940}],"down_context":[{"change":6,"pos":373472}],"flag":"BLOCK","start":56080,"end":56102,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":554,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373480},"to":{"change":6,"start":17261,"end":17332},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":557,"ins":{"up_context":[{"change":6,"pos":373614}],"down_context":[{"change":6,"pos":373698}],"flag":"BLOCK","start":56103,"end":56184,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373614},"to":{"change":6,"start":34941,"end":35026},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":559,"ins":{"up_context":[{"change":6,"pos":373740}],"down_context":[{"change":6,"pos":373763}],"flag":"BLOCK","start":56185,"end":56204,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373740},"to":{"change":6,"start":373740,"end":373763},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":561,"ins":{"up_context":[{"change":6,"pos":373781}],"down_context":[{"change":6,"pos":373825}],"flag":"BLOCK","start":56205,"end":56241,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373781},"to":{"change":6,"start":373781,"end":373825},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":566,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35041}],"down_context":[{"change":6,"pos":373851}],"flag":"BLOCK","start":56242,"end":56264,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":569,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":373859},"to":{"change":6,"start":17333,"end":17404},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":588,"ins":{"up_context":[{"change":6,"pos":374452}],"down_context":[{"change":6,"pos":374731}],"flag":"BLOCK","start":56265,"end":56494,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374452},"to":{"change":6,"start":34300,"end":34348},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34348},"to":{"change":6,"start":374491,"end":374669},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374491},"to":{"change":6,"start":374491,"end":374669},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374669},"to":{"change":6,"start":17405,"end":17478},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&mut repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":594,"ins":{"up_context":[{"change":6,"pos":374750}],"down_context":[{"change":6,"pos":374884}],"flag":"BLOCK","start":56495,"end":56630,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374750},"to":{"change":6,"start":374750,"end":374812},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374812},"to":{"change":6,"start":35042,"end":35115},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":597,"ins":{"up_context":[{"change":6,"pos":374926}],"down_context":[{"change":6,"pos":374945}],"flag":"BLOCK","start":56631,"end":56646,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374926},"to":{"change":6,"start":374926,"end":374945},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":599,"ins":{"up_context":[{"change":6,"pos":374963}],"down_context":[{"change":6,"pos":375007}],"flag":"BLOCK","start":56647,"end":56683,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":374963},"to":{"change":6,"start":374963,"end":375007},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":604,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35130}],"down_context":[{"change":6,"pos":375033}],"flag":"BLOCK","start":56684,"end":56706,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":610,"ins":{"up_context":[{"change":6,"pos":375120}],"down_context":[{"change":6,"pos":375477}],"flag":"BLOCK","start":56707,"end":56839,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375120},"to":{"change":6,"start":4190,"end":4248},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4248},"to":{"change":6,"start":375154,"end":375213},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375154},"to":{"change":6,"start":375154,"end":375213},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375213},"to":{"change":6,"start":17479,"end":17623},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":17623},"to":{"change":6,"start":375335,"end":375417},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24344},"to":{"change":6,"start":375335,"end":375417},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375335},"to":{"change":6,"start":375335,"end":375417},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375417},"to":{"change":6,"start":17624,"end":17695},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":614,"ins":{"up_context":[{"change":6,"pos":375509}],"down_context":[{"change":6,"pos":375754}],"flag":"BLOCK","start":56840,"end":56978,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375509},"to":{"change":6,"start":4249,"end":4307},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4307},"to":{"change":6,"start":375543,"end":375690},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375543},"to":{"change":6,"start":375543,"end":375690},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375690},"to":{"change":6,"start":17696,"end":17771},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(alice).unwrap();"},{"Add":" let alice_h = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":618,"ins":{"up_context":[{"change":6,"pos":375789}],"down_context":[{"change":6,"pos":375862}],"flag":"BLOCK","start":56979,"end":57049,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375789},"to":{"change":6,"start":35131,"end":35205},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":620,"ins":{"up_context":[{"change":6,"pos":375904}],"down_context":[{"change":6,"pos":375923}],"flag":"BLOCK","start":57050,"end":57065,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375904},"to":{"change":6,"start":375904,"end":375923},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":622,"ins":{"up_context":[{"change":6,"pos":375941}],"down_context":[{"change":6,"pos":375987}],"flag":"BLOCK","start":57066,"end":57104,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":375941},"to":{"change":6,"start":375941,"end":375987},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":627,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35220}],"down_context":[{"change":6,"pos":376013}],"flag":"BLOCK","start":57105,"end":57127,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":635,"ins":{"up_context":[{"change":6,"pos":376206}],"down_context":[{"change":6,"pos":376240}],"flag":"BLOCK","start":57128,"end":57188,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":376206},"to":{"change":6,"start":4308,"end":4366},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":658,"ins":{"up_context":[{"change":6,"pos":376884}],"down_context":[{"change":6,"pos":376908}],"flag":"BLOCK","start":57189,"end":57195,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":376884},"to":{"change":6,"start":376884,"end":376908},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":661,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":376977},"to":{"change":6,"start":17772,"end":17847},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":662,"ins":{"up_context":[{"change":6,"pos":377065}],"down_context":[{"change":6,"pos":377154}],"flag":"BLOCK","start":57196,"end":57273,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377065},"to":{"change":6,"start":377065,"end":377154},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":664,"ins":{"up_context":[{"change":6,"pos":377196}],"down_context":[{"change":6,"pos":377215}],"flag":"BLOCK","start":57274,"end":57289,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377196},"to":{"change":6,"start":377196,"end":377215},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":666,"ins":{"up_context":[{"change":6,"pos":377233}],"down_context":[{"change":6,"pos":377279}],"flag":"BLOCK","start":57290,"end":57328,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377233},"to":{"change":6,"start":377233,"end":377279},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":671,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35235}],"down_context":[{"change":6,"pos":377305}],"flag":"BLOCK","start":57329,"end":57351,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":677,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377440},"to":{"change":6,"start":17848,"end":17923},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":680,"ins":{"up_context":[{"change":6,"pos":377595}],"down_context":[{"change":6,"pos":377744}],"flag":"BLOCK","start":57352,"end":57495,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377595},"to":{"change":6,"start":35236,"end":35387},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":683,"ins":{"up_context":[{"change":6,"pos":377786}],"down_context":[{"change":6,"pos":377805}],"flag":"BLOCK","start":57496,"end":57511,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377786},"to":{"change":6,"start":377786,"end":377805},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":685,"ins":{"up_context":[{"change":6,"pos":377823}],"down_context":[{"change":6,"pos":377867}],"flag":"BLOCK","start":57512,"end":57548,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":377823},"to":{"change":6,"start":377823,"end":377867},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":690,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35402}],"down_context":[{"change":6,"pos":377893}],"flag":"BLOCK","start":57549,"end":57571,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":711,"ins":{"up_context":[{"change":6,"pos":378435}],"down_context":[{"change":6,"pos":378491}],"flag":"BLOCK","start":57572,"end":57624,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":378435},"to":{"change":6,"start":378435,"end":378491},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":716,"ins":{"up_context":[{"change":6,"pos":378650}],"down_context":[{"change":6,"pos":378929}],"flag":"BLOCK","start":57625,"end":57850,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":378650},"to":{"change":6,"start":34349,"end":34397},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34397},"to":{"change":6,"start":378689,"end":378867},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":378689},"to":{"change":6,"start":378689,"end":378867},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":378867},"to":{"change":6,"start":17924,"end":17997},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":722,"ins":{"up_context":[{"change":6,"pos":378948}],"down_context":[{"change":6,"pos":379082}],"flag":"BLOCK","start":57851,"end":57986,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":378948},"to":{"change":6,"start":378948,"end":379010},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379010},"to":{"change":6,"start":35403,"end":35476},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":725,"ins":{"up_context":[{"change":6,"pos":379124}],"down_context":[{"change":6,"pos":379143}],"flag":"BLOCK","start":57987,"end":58002,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379124},"to":{"change":6,"start":379124,"end":379143},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":727,"ins":{"up_context":[{"change":6,"pos":379161}],"down_context":[{"change":6,"pos":379205}],"flag":"BLOCK","start":58003,"end":58039,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379161},"to":{"change":6,"start":379161,"end":379205},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":732,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35491}],"down_context":[{"change":6,"pos":379231}],"flag":"BLOCK","start":58040,"end":58062,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":738,"ins":{"up_context":[{"change":6,"pos":379318}],"down_context":[{"change":6,"pos":379675}],"flag":"BLOCK","start":58063,"end":58195,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379318},"to":{"change":6,"start":4367,"end":4425},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4425},"to":{"change":6,"start":379352,"end":379411},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379352},"to":{"change":6,"start":379352,"end":379411},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379411},"to":{"change":6,"start":17998,"end":18142},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":18142},"to":{"change":6,"start":379533,"end":379615},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24800},"to":{"change":6,"start":379533,"end":379615},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379533},"to":{"change":6,"start":379533,"end":379615},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379615},"to":{"change":6,"start":18143,"end":18214},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":742,"ins":{"up_context":[{"change":6,"pos":379707}],"down_context":[{"change":6,"pos":379952}],"flag":"BLOCK","start":58196,"end":58334,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379707},"to":{"change":6,"start":4426,"end":4484},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4484},"to":{"change":6,"start":379741,"end":379888},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379741},"to":{"change":6,"start":379741,"end":379888},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379888},"to":{"change":6,"start":18215,"end":18290},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(alice).unwrap();"},{"Add":" let alice_h = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":746,"ins":{"up_context":[{"change":6,"pos":379987}],"down_context":[{"change":6,"pos":380060}],"flag":"BLOCK","start":58335,"end":58405,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":379987},"to":{"change":6,"start":35492,"end":35566},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":748,"ins":{"up_context":[{"change":6,"pos":380102}],"down_context":[{"change":6,"pos":380121}],"flag":"BLOCK","start":58406,"end":58421,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":380102},"to":{"change":6,"start":380102,"end":380121},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":750,"ins":{"up_context":[{"change":6,"pos":380139}],"down_context":[{"change":6,"pos":380185}],"flag":"BLOCK","start":58422,"end":58460,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":380139},"to":{"change":6,"start":380139,"end":380185},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":755,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35581}],"down_context":[{"change":6,"pos":380211}],"flag":"BLOCK","start":58461,"end":58483,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":763,"ins":{"up_context":[{"change":6,"pos":380404}],"down_context":[{"change":6,"pos":380438}],"flag":"BLOCK","start":58484,"end":58544,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":380404},"to":{"change":6,"start":4485,"end":4543},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":773,"ins":{"up_context":[{"change":6,"pos":380725}],"down_context":[{"change":6,"pos":380749}],"flag":"BLOCK","start":58545,"end":58551,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":380725},"to":{"change":6,"start":380725,"end":380749},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":776,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":380818},"to":{"change":6,"start":18291,"end":18366},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":778,"ins":{"up_context":[{"change":6,"pos":380907}],"down_context":[{"change":6,"pos":380996}],"flag":"BLOCK","start":58552,"end":58629,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":380907},"to":{"change":6,"start":380907,"end":380996},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":780,"ins":{"up_context":[{"change":6,"pos":381038}],"down_context":[{"change":6,"pos":381057}],"flag":"BLOCK","start":58630,"end":58645,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":381038},"to":{"change":6,"start":381038,"end":381057},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":782,"ins":{"up_context":[{"change":6,"pos":381075}],"down_context":[{"change":6,"pos":381121}],"flag":"BLOCK","start":58646,"end":58684,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":381075},"to":{"change":6,"start":381075,"end":381121},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":787,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35596}],"down_context":[{"change":6,"pos":381147}],"flag":"BLOCK","start":58685,"end":58707,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":793,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":381282},"to":{"change":6,"start":18367,"end":18442},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":795,"ins":{"up_context":[{"change":6,"pos":381418}],"down_context":[{"change":6,"pos":381567}],"flag":"BLOCK","start":58708,"end":58851,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":381418},"to":{"change":6,"start":35597,"end":35748},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":798,"ins":{"up_context":[{"change":6,"pos":381609}],"down_context":[{"change":6,"pos":381628}],"flag":"BLOCK","start":58852,"end":58867,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":381609},"to":{"change":6,"start":381609,"end":381628},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":800,"ins":{"up_context":[{"change":6,"pos":381646}],"down_context":[{"change":6,"pos":381690}],"flag":"BLOCK","start":58868,"end":58904,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":381646},"to":{"change":6,"start":381646,"end":381690},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":805,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35763}],"down_context":[{"change":6,"pos":381716}],"flag":"BLOCK","start":58905,"end":58927,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":835,"ins":{"up_context":[{"change":6,"pos":382540}],"down_context":[{"change":6,"pos":382819}],"flag":"BLOCK","start":58928,"end":59157,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":382540},"to":{"change":6,"start":34398,"end":34446},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34446},"to":{"change":6,"start":382579,"end":382757},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":382579},"to":{"change":6,"start":382579,"end":382757},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":382757},"to":{"change":6,"start":18443,"end":18516},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":841,"ins":{"up_context":[{"change":6,"pos":382838}],"down_context":[{"change":6,"pos":382972}],"flag":"BLOCK","start":59158,"end":59297,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":382838},"to":{"change":6,"start":382838,"end":382900},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":382900},"to":{"change":6,"start":35764,"end":35837},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":844,"ins":{"up_context":[{"change":6,"pos":383014}],"down_context":[{"change":6,"pos":383033}],"flag":"BLOCK","start":59298,"end":59313,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":383014},"to":{"change":6,"start":383014,"end":383033},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":846,"ins":{"up_context":[{"change":6,"pos":383051}],"down_context":[{"change":6,"pos":383095}],"flag":"BLOCK","start":59314,"end":59350,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":383051},"to":{"change":6,"start":383051,"end":383095},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":851,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35852}],"down_context":[{"change":6,"pos":383121}],"flag":"BLOCK","start":59351,"end":59373,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":861,"ins":{"up_context":[{"change":6,"pos":383330}],"down_context":[{"change":6,"pos":383561}],"flag":"BLOCK","start":59374,"end":59517,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":383330},"to":{"change":6,"start":4544,"end":4610},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4610},"to":{"change":6,"start":383372,"end":383561},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":383372},"to":{"change":6,"start":383372,"end":383561},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" record_all(&repo, &changes, &txn, &channel_bob, \"\").unwrap()"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })\n .unwrap();\n record_all(&mut repo, &changes, &mut txn, &mut channel_bob, \"\").unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":871,"ins":{"up_context":[{"change":6,"pos":383758}],"down_context":[{"change":6,"pos":383993}],"flag":"BLOCK","start":59518,"end":59665,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":383758},"to":{"change":6,"start":4611,"end":4677},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4677},"to":{"change":6,"start":383800,"end":383993},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":383800},"to":{"change":6,"start":383800,"end":383993},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo.write_file(\"file\").unwrap().write_all(alice).unwrap();"},{"Add":" record_all(&repo, &changes, &txn, &channel_alice, \"\").unwrap()"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })\n .unwrap();\n record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\").unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":878,"ins":{"up_context":[{"change":6,"pos":384098}],"down_context":[{"change":6,"pos":384176}],"flag":"BLOCK","start":59666,"end":59739,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":384098},"to":{"change":6,"start":35853,"end":35930},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":881,"ins":{"up_context":[{"change":6,"pos":384224}],"down_context":[{"change":6,"pos":384243}],"flag":"BLOCK","start":59740,"end":59755,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":384224},"to":{"change":6,"start":384224,"end":384243},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":883,"ins":{"up_context":[{"change":6,"pos":384261}],"down_context":[{"change":6,"pos":384307}],"flag":"BLOCK","start":59756,"end":59794,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":384261},"to":{"change":6,"start":384261,"end":384307},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":888,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35945}],"down_context":[{"change":6,"pos":384333}],"flag":"BLOCK","start":59795,"end":59817,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":896,"ins":{"up_context":[{"change":6,"pos":384526}],"down_context":[{"change":6,"pos":384560}],"flag":"BLOCK","start":59818,"end":59878,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":384526},"to":{"change":6,"start":4678,"end":4736},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":912,"ins":{"up_context":[{"change":6,"pos":385004}],"down_context":[{"change":6,"pos":385028}],"flag":"BLOCK","start":59879,"end":59885,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385004},"to":{"change":6,"start":385004,"end":385028},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":915,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385097},"to":{"change":6,"start":18517,"end":18592},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":917,"ins":{"up_context":[{"change":6,"pos":385186}],"down_context":[{"change":6,"pos":385279}],"flag":"BLOCK","start":59886,"end":59967,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385186},"to":{"change":6,"start":385186,"end":385279},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let conflict_edits = record_all(&repo, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let conflict_edits = record_all(&mut repo, &changes, &mut txn, &mut channel_alice, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":919,"ins":{"up_context":[{"change":6,"pos":385321}],"down_context":[{"change":6,"pos":385340}],"flag":"BLOCK","start":59968,"end":59983,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385321},"to":{"change":6,"start":385321,"end":385340},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" &mut repo,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":921,"ins":{"up_context":[{"change":6,"pos":385358}],"down_context":[{"change":6,"pos":385404}],"flag":"BLOCK","start":59984,"end":60022,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385358},"to":{"change":6,"start":385358,"end":385404},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":926,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":35960}],"down_context":[{"change":6,"pos":385430}],"flag":"BLOCK","start":60023,"end":60045,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":932,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385565},"to":{"change":6,"start":18593,"end":18668},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":936,"ins":{"up_context":[{"change":6,"pos":385760}],"down_context":[{"change":6,"pos":385838}],"flag":"BLOCK","start":60046,"end":60121,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385760},"to":{"change":6,"start":35961,"end":36040},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &*alice_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &*alice_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":938,"ins":{"up_context":[{"change":6,"pos":385844}],"down_context":[{"change":6,"pos":385924}],"flag":"BLOCK","start":60122,"end":60199,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":385844},"to":{"change":6,"start":36041,"end":36122},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &conflict_edits)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &conflict_edits)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":947,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36137}],"down_context":[{"change":6,"pos":386073}],"flag":"BLOCK","start":60200,"end":60222,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":950,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":386081},"to":{"change":6,"start":18669,"end":18739},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":974,"ins":{"up_context":[{"change":6,"pos":386856}],"down_context":[{"change":6,"pos":387141}],"flag":"BLOCK","start":60223,"end":60462,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":386856},"to":{"change":6,"start":34447,"end":34495},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34495},"to":{"change":6,"start":386895,"end":387079},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":386895},"to":{"change":6,"start":386895,"end":387079},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387079},"to":{"change":6,"start":18740,"end":18813},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"},{"Add":" let mut channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":980,"ins":{"up_context":[{"change":6,"pos":387160}],"down_context":[{"change":6,"pos":387354}],"flag":"BLOCK","start":60463,"end":60654,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387160},"to":{"change":6,"start":387160,"end":387282},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387282},"to":{"change":6,"start":36138,"end":36211},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":984,"ins":{"up_context":[{"change":6,"pos":387396}],"down_context":[{"change":6,"pos":387419}],"flag":"BLOCK","start":60655,"end":60674,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387396},"to":{"change":6,"start":387396,"end":387419},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":986,"ins":{"up_context":[{"change":6,"pos":387437}],"down_context":[{"change":6,"pos":387481}],"flag":"BLOCK","start":60675,"end":60711,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387437},"to":{"change":6,"start":387437,"end":387481},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":991,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36226}],"down_context":[{"change":6,"pos":387507}],"flag":"BLOCK","start":60712,"end":60734,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1001,"ins":{"up_context":[{"change":6,"pos":387750}],"down_context":[{"change":6,"pos":388115}],"flag":"BLOCK","start":60735,"end":60875,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387750},"to":{"change":6,"start":4737,"end":4799},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4799},"to":{"change":6,"start":387788,"end":387847},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387788},"to":{"change":6,"start":387788,"end":387847},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387847},"to":{"change":6,"start":18814,"end":18958},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":18958},"to":{"change":6,"start":387969,"end":388055},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":25517},"to":{"change":6,"start":387969,"end":388055},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":387969},"to":{"change":6,"start":387969,"end":388055},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388055},"to":{"change":6,"start":18959,"end":19030},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1005,"ins":{"up_context":[{"change":6,"pos":388147}],"down_context":[{"change":6,"pos":388404}],"flag":"BLOCK","start":60876,"end":61062,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388147},"to":{"change":6,"start":4800,"end":4864},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4864},"to":{"change":6,"start":388187,"end":388340},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388187},"to":{"change":6,"start":388187,"end":388340},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388340},"to":{"change":6,"start":19031,"end":19106},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1013,"ins":{"up_context":[{"change":6,"pos":388439}],"down_context":[{"change":6,"pos":388512}],"flag":"BLOCK","start":61063,"end":61133,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388439},"to":{"change":6,"start":36227,"end":36301},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1015,"ins":{"up_context":[{"change":6,"pos":388554}],"down_context":[{"change":6,"pos":388579}],"flag":"BLOCK","start":61134,"end":61155,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388554},"to":{"change":6,"start":388554,"end":388579},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1017,"ins":{"up_context":[{"change":6,"pos":388597}],"down_context":[{"change":6,"pos":388643}],"flag":"BLOCK","start":61156,"end":61194,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388597},"to":{"change":6,"start":388597,"end":388643},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1022,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36316}],"down_context":[{"change":6,"pos":388669}],"flag":"BLOCK","start":61195,"end":61217,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1048,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":389412},"to":{"change":6,"start":19107,"end":19182},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1051,"ins":{"up_context":[{"change":6,"pos":389584}],"down_context":[{"change":6,"pos":389624}],"flag":"BLOCK","start":61218,"end":61284,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":389584},"to":{"change":6,"start":4865,"end":4929},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1056,"ins":{"up_context":[{"change":6,"pos":389728}],"down_context":[{"change":6,"pos":389752}],"flag":"BLOCK","start":61285,"end":61291,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":389728},"to":{"change":6,"start":389728,"end":389752},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1062,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":389959},"to":{"change":6,"start":19183,"end":19258},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1064,"ins":{"up_context":[{"change":6,"pos":390058}],"down_context":[{"change":6,"pos":390139}],"flag":"BLOCK","start":61292,"end":61370,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390058},"to":{"change":6,"start":36317,"end":36399},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1066,"ins":{"up_context":[{"change":6,"pos":390181}],"down_context":[{"change":6,"pos":390204}],"flag":"BLOCK","start":61371,"end":61390,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390181},"to":{"change":6,"start":390181,"end":390204},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1068,"ins":{"up_context":[{"change":6,"pos":390222}],"down_context":[{"change":6,"pos":390266}],"flag":"BLOCK","start":61391,"end":61427,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390222},"to":{"change":6,"start":390222,"end":390266},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1073,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36414}],"down_context":[{"change":6,"pos":390292}],"flag":"BLOCK","start":61428,"end":61450,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1076,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390300},"to":{"change":6,"start":19259,"end":19330},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1080,"ins":{"up_context":[{"change":6,"pos":390448}],"down_context":[{"change":6,"pos":390592}],"flag":"BLOCK","start":61451,"end":61532,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390448},"to":{"change":6,"start":36415,"end":36500},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":36500},"to":{"change":6,"start":19331,"end":19402},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390532},"to":{"change":6,"start":19331,"end":19402},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1082,"ins":{"up_context":[{"change":6,"pos":390634}],"down_context":[{"change":6,"pos":390657}],"flag":"BLOCK","start":61533,"end":61552,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390634},"to":{"change":6,"start":390634,"end":390657},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1084,"ins":{"up_context":[{"change":6,"pos":390675}],"down_context":[{"change":6,"pos":390719}],"flag":"BLOCK","start":61553,"end":61589,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":390675},"to":{"change":6,"start":390675,"end":390719},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1089,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36515}],"down_context":[{"change":6,"pos":390745}],"flag":"BLOCK","start":61590,"end":61612,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1106,"ins":{"up_context":[{"change":6,"pos":391080}],"down_context":[{"change":6,"pos":391142}],"flag":"BLOCK","start":61613,"end":61671,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391080},"to":{"change":6,"start":391080,"end":391142},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1111,"ins":{"up_context":[{"change":6,"pos":391307}],"down_context":[{"change":6,"pos":391592}],"flag":"BLOCK","start":61672,"end":61907,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391307},"to":{"change":6,"start":34496,"end":34544},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34544},"to":{"change":6,"start":391346,"end":391530},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391346},"to":{"change":6,"start":391346,"end":391530},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391530},"to":{"change":6,"start":19403,"end":19476},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1118,"ins":{"up_context":[{"change":6,"pos":391671}],"down_context":[{"change":6,"pos":391805}],"flag":"BLOCK","start":61908,"end":62047,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391671},"to":{"change":6,"start":391671,"end":391733},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391733},"to":{"change":6,"start":36516,"end":36589},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1121,"ins":{"up_context":[{"change":6,"pos":391847}],"down_context":[{"change":6,"pos":391870}],"flag":"BLOCK","start":62048,"end":62067,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391847},"to":{"change":6,"start":391847,"end":391870},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1123,"ins":{"up_context":[{"change":6,"pos":391888}],"down_context":[{"change":6,"pos":391932}],"flag":"BLOCK","start":62068,"end":62104,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":391888},"to":{"change":6,"start":391888,"end":391932},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1128,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36604}],"down_context":[{"change":6,"pos":391958}],"flag":"BLOCK","start":62105,"end":62127,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1138,"ins":{"up_context":[{"change":6,"pos":392201}],"down_context":[{"change":6,"pos":392566}],"flag":"BLOCK","start":62128,"end":62268,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392201},"to":{"change":6,"start":4930,"end":4992},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":4992},"to":{"change":6,"start":392239,"end":392298},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392239},"to":{"change":6,"start":392239,"end":392298},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392298},"to":{"change":6,"start":19477,"end":19621},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":19621},"to":{"change":6,"start":392420,"end":392506},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":26099},"to":{"change":6,"start":392420,"end":392506},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392420},"to":{"change":6,"start":392420,"end":392506},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392506},"to":{"change":6,"start":19622,"end":19693},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1142,"ins":{"up_context":[{"change":6,"pos":392598}],"down_context":[{"change":6,"pos":392855}],"flag":"BLOCK","start":62269,"end":62455,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392598},"to":{"change":6,"start":4993,"end":5057},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5057},"to":{"change":6,"start":392638,"end":392791},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392638},"to":{"change":6,"start":392638,"end":392791},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392791},"to":{"change":6,"start":19694,"end":19769},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1150,"ins":{"up_context":[{"change":6,"pos":392890}],"down_context":[{"change":6,"pos":392963}],"flag":"BLOCK","start":62456,"end":62526,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":392890},"to":{"change":6,"start":36605,"end":36679},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1152,"ins":{"up_context":[{"change":6,"pos":393005}],"down_context":[{"change":6,"pos":393030}],"flag":"BLOCK","start":62527,"end":62548,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":393005},"to":{"change":6,"start":393005,"end":393030},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1154,"ins":{"up_context":[{"change":6,"pos":393048}],"down_context":[{"change":6,"pos":393094}],"flag":"BLOCK","start":62549,"end":62587,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":393048},"to":{"change":6,"start":393048,"end":393094},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1159,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36694}],"down_context":[{"change":6,"pos":393120}],"flag":"BLOCK","start":62588,"end":62610,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1177,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":393580},"to":{"change":6,"start":19770,"end":19845},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1182,"ins":{"up_context":[{"change":6,"pos":393726}],"down_context":[{"change":6,"pos":393752}],"flag":"BLOCK","start":62611,"end":62640,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":393726},"to":{"change":6,"start":393726,"end":393752},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn.clone(),"}],"del_contents":[{"Del":" &mut txn,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1184,"ins":{"up_context":[{"change":6,"pos":393790}],"down_context":[{"change":6,"pos":393859}],"flag":"BLOCK","start":62641,"end":62709,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":393790},"to":{"change":6,"start":28778,"end":28827},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28827},"to":{"change":6,"start":393826,"end":393859},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":393826},"to":{"change":6,"start":393826,"end":393859},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" channel_alice.clone(),"},{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut channel_alice.borrow_mut(),\n"},{"Del":" &mut repo_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1188,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":393905}],"down_context":[{"change":6,"pos":393905}],"flag":"BLOCK","start":62710,"end":62729,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1196,"ins":{"up_context":[{"change":6,"pos":394057}],"down_context":[{"change":6,"pos":394146}],"flag":"BLOCK","start":62730,"end":62791,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394057},"to":{"change":6,"start":5058,"end":5122},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5122},"to":{"change":6,"start":394097,"end":394146},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394097},"to":{"change":6,"start":394097,"end":394146},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file(\"file\").unwrap().write_all(b\"x\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" write!(w, \"x\")?;\n Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1201,"ins":{"up_context":[{"change":6,"pos":394258}],"down_context":[{"change":6,"pos":394417}],"flag":"BLOCK","start":62792,"end":62875,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394258},"to":{"change":6,"start":394258,"end":394353},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394353},"to":{"change":6,"start":19846,"end":19921},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1204,"ins":{"up_context":[{"change":6,"pos":394452}],"down_context":[{"change":6,"pos":394533}],"flag":"BLOCK","start":62876,"end":62954,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394452},"to":{"change":6,"start":36695,"end":36777},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1213,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36792}],"down_context":[{"change":6,"pos":394686}],"flag":"BLOCK","start":62955,"end":62977,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1216,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394694},"to":{"change":6,"start":19922,"end":19993},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1220,"ins":{"up_context":[{"change":6,"pos":394842}],"down_context":[{"change":6,"pos":394986}],"flag":"BLOCK","start":62978,"end":63059,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394842},"to":{"change":6,"start":36793,"end":36878},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":36878},"to":{"change":6,"start":19994,"end":20065},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":394926},"to":{"change":6,"start":19994,"end":20065},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1229,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36893}],"down_context":[{"change":6,"pos":395139}],"flag":"BLOCK","start":63060,"end":63082,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1349,"ins":{"up_context":[{"change":6,"pos":398698}],"down_context":[{"change":6,"pos":398760}],"flag":"BLOCK","start":63083,"end":63141,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":398698},"to":{"change":6,"start":398698,"end":398760},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1354,"ins":{"up_context":[{"change":6,"pos":398925}],"down_context":[{"change":6,"pos":399210}],"flag":"BLOCK","start":63142,"end":63373,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":398925},"to":{"change":6,"start":34545,"end":34593},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34593},"to":{"change":6,"start":398964,"end":399148},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":398964},"to":{"change":6,"start":398964,"end":399148},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399148},"to":{"change":6,"start":20066,"end":20139},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1360,"ins":{"up_context":[{"change":6,"pos":399229}],"down_context":[{"change":6,"pos":399423}],"flag":"BLOCK","start":63374,"end":63565,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399229},"to":{"change":6,"start":399229,"end":399351},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399351},"to":{"change":6,"start":36894,"end":36967},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1364,"ins":{"up_context":[{"change":6,"pos":399465}],"down_context":[{"change":6,"pos":399488}],"flag":"BLOCK","start":63566,"end":63585,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399465},"to":{"change":6,"start":399465,"end":399488},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1366,"ins":{"up_context":[{"change":6,"pos":399506}],"down_context":[{"change":6,"pos":399550}],"flag":"BLOCK","start":63586,"end":63622,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399506},"to":{"change":6,"start":399506,"end":399550},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1371,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":36982}],"down_context":[{"change":6,"pos":399576}],"flag":"BLOCK","start":63623,"end":63645,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1381,"ins":{"up_context":[{"change":6,"pos":399819}],"down_context":[{"change":6,"pos":400184}],"flag":"BLOCK","start":63646,"end":63786,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399819},"to":{"change":6,"start":5387,"end":5449},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5449},"to":{"change":6,"start":399857,"end":399916},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399857},"to":{"change":6,"start":399857,"end":399916},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":399916},"to":{"change":6,"start":20140,"end":20284},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20284},"to":{"change":6,"start":400038,"end":400124},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":26681},"to":{"change":6,"start":400038,"end":400124},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400038},"to":{"change":6,"start":400038,"end":400124},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400124},"to":{"change":6,"start":20285,"end":20356},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1385,"ins":{"up_context":[{"change":6,"pos":400216}],"down_context":[{"change":6,"pos":400473}],"flag":"BLOCK","start":63787,"end":63973,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400216},"to":{"change":6,"start":5450,"end":5514},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5514},"to":{"change":6,"start":400256,"end":400409},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400256},"to":{"change":6,"start":400256,"end":400409},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400409},"to":{"change":6,"start":20357,"end":20432},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1393,"ins":{"up_context":[{"change":6,"pos":400508}],"down_context":[{"change":6,"pos":400581}],"flag":"BLOCK","start":63974,"end":64044,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400508},"to":{"change":6,"start":36983,"end":37057},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1395,"ins":{"up_context":[{"change":6,"pos":400623}],"down_context":[{"change":6,"pos":400648}],"flag":"BLOCK","start":64045,"end":64066,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400623},"to":{"change":6,"start":400623,"end":400648},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1397,"ins":{"up_context":[{"change":6,"pos":400666}],"down_context":[{"change":6,"pos":400712}],"flag":"BLOCK","start":64067,"end":64105,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400666},"to":{"change":6,"start":400666,"end":400712},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1402,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37072}],"down_context":[{"change":6,"pos":400738}],"flag":"BLOCK","start":64106,"end":64128,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1408,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400822},"to":{"change":6,"start":20433,"end":20508},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1411,"ins":{"up_context":[{"change":6,"pos":400938}],"down_context":[{"change":6,"pos":400982}],"flag":"BLOCK","start":64129,"end":64195,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":400938},"to":{"change":6,"start":5515,"end":5583},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |mut w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1414,"ins":{"up_context":[{"change":6,"pos":401014}],"down_context":[{"change":6,"pos":401038}],"flag":"BLOCK","start":64196,"end":64202,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401014},"to":{"change":6,"start":401014,"end":401038},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1416,"ins":{"up_context":[{"change":6,"pos":401062}],"down_context":[{"change":6,"pos":401221}],"flag":"BLOCK","start":64203,"end":64286,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401062},"to":{"change":6,"start":401062,"end":401157},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401157},"to":{"change":6,"start":20509,"end":20584},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1419,"ins":{"up_context":[{"change":6,"pos":401256}],"down_context":[{"change":6,"pos":401337}],"flag":"BLOCK","start":64287,"end":64365,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401256},"to":{"change":6,"start":37073,"end":37155},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1421,"ins":{"up_context":[{"change":6,"pos":401379}],"down_context":[{"change":6,"pos":401402}],"flag":"BLOCK","start":64366,"end":64385,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401379},"to":{"change":6,"start":401379,"end":401402},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1423,"ins":{"up_context":[{"change":6,"pos":401420}],"down_context":[{"change":6,"pos":401464}],"flag":"BLOCK","start":64386,"end":64422,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401420},"to":{"change":6,"start":401420,"end":401464},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1428,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37170}],"down_context":[{"change":6,"pos":401490}],"flag":"BLOCK","start":64423,"end":64445,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1431,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401498},"to":{"change":6,"start":20585,"end":20656},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1436,"ins":{"up_context":[{"change":6,"pos":401673}],"down_context":[{"change":6,"pos":401757}],"flag":"BLOCK","start":64446,"end":64527,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401673},"to":{"change":6,"start":37171,"end":37256},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1438,"ins":{"up_context":[{"change":6,"pos":401799}],"down_context":[{"change":6,"pos":401822}],"flag":"BLOCK","start":64528,"end":64547,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401799},"to":{"change":6,"start":401799,"end":401822},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1440,"ins":{"up_context":[{"change":6,"pos":401840}],"down_context":[{"change":6,"pos":401884}],"flag":"BLOCK","start":64548,"end":64584,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401840},"to":{"change":6,"start":401840,"end":401884},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1445,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37271}],"down_context":[{"change":6,"pos":401910}],"flag":"BLOCK","start":64585,"end":64607,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1448,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":401918},"to":{"change":6,"start":20657,"end":20728},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1470,"ins":{"up_context":[{"change":6,"pos":402557}],"down_context":[{"change":6,"pos":402619}],"flag":"BLOCK","start":64608,"end":64666,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":402557},"to":{"change":6,"start":402557,"end":402619},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1475,"ins":{"up_context":[{"change":6,"pos":402784}],"down_context":[{"change":6,"pos":403069}],"flag":"BLOCK","start":64667,"end":64898,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":402784},"to":{"change":6,"start":34594,"end":34642},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34642},"to":{"change":6,"start":402823,"end":403007},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":402823},"to":{"change":6,"start":402823,"end":403007},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403007},"to":{"change":6,"start":20729,"end":20802},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1481,"ins":{"up_context":[{"change":6,"pos":403088}],"down_context":[{"change":6,"pos":403282}],"flag":"BLOCK","start":64899,"end":65090,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403088},"to":{"change":6,"start":403088,"end":403210},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403210},"to":{"change":6,"start":37272,"end":37345},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1485,"ins":{"up_context":[{"change":6,"pos":403324}],"down_context":[{"change":6,"pos":403347}],"flag":"BLOCK","start":65091,"end":65110,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403324},"to":{"change":6,"start":403324,"end":403347},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1487,"ins":{"up_context":[{"change":6,"pos":403365}],"down_context":[{"change":6,"pos":403409}],"flag":"BLOCK","start":65111,"end":65147,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403365},"to":{"change":6,"start":403365,"end":403409},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1492,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37360}],"down_context":[{"change":6,"pos":403435}],"flag":"BLOCK","start":65148,"end":65170,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1503,"ins":{"up_context":[{"change":6,"pos":403679}],"down_context":[{"change":6,"pos":404044}],"flag":"BLOCK","start":65171,"end":65311,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403679},"to":{"change":6,"start":5584,"end":5646},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5646},"to":{"change":6,"start":403717,"end":403776},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403717},"to":{"change":6,"start":403717,"end":403776},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403776},"to":{"change":6,"start":20803,"end":20947},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":20947},"to":{"change":6,"start":403898,"end":403984},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":27263},"to":{"change":6,"start":403898,"end":403984},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403898},"to":{"change":6,"start":403898,"end":403984},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":403984},"to":{"change":6,"start":20948,"end":21019},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1508,"ins":{"up_context":[{"change":6,"pos":404105}],"down_context":[{"change":6,"pos":404362}],"flag":"BLOCK","start":65312,"end":65498,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404105},"to":{"change":6,"start":5647,"end":5711},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5711},"to":{"change":6,"start":404145,"end":404298},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404145},"to":{"change":6,"start":404145,"end":404298},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404298},"to":{"change":6,"start":21020,"end":21095},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1517,"ins":{"up_context":[{"change":6,"pos":404426}],"down_context":[{"change":6,"pos":404499}],"flag":"BLOCK","start":65499,"end":65569,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404426},"to":{"change":6,"start":37361,"end":37435},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1519,"ins":{"up_context":[{"change":6,"pos":404541}],"down_context":[{"change":6,"pos":404566}],"flag":"BLOCK","start":65570,"end":65591,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404541},"to":{"change":6,"start":404541,"end":404566},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1521,"ins":{"up_context":[{"change":6,"pos":404584}],"down_context":[{"change":6,"pos":404630}],"flag":"BLOCK","start":65592,"end":65630,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404584},"to":{"change":6,"start":404584,"end":404630},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1526,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37450}],"down_context":[{"change":6,"pos":404656}],"flag":"BLOCK","start":65631,"end":65653,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1529,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404664},"to":{"change":6,"start":21096,"end":21171},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1533,"ins":{"up_context":[{"change":6,"pos":404838}],"down_context":[{"change":6,"pos":404878}],"flag":"BLOCK","start":65654,"end":65720,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404838},"to":{"change":6,"start":5712,"end":5776},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1537,"ins":{"up_context":[{"change":6,"pos":404995}],"down_context":[{"change":6,"pos":405019}],"flag":"BLOCK","start":65721,"end":65727,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404995},"to":{"change":6,"start":404995,"end":405019},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1539,"ins":{"up_context":[{"change":6,"pos":405043}],"down_context":[{"change":6,"pos":405208}],"flag":"BLOCK","start":65728,"end":65817,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405043},"to":{"change":6,"start":405043,"end":405144},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405144},"to":{"change":6,"start":21172,"end":21247},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution_alice = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution_alice = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1542,"ins":{"up_context":[{"change":6,"pos":405243}],"down_context":[{"change":6,"pos":405324}],"flag":"BLOCK","start":65818,"end":65896,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405243},"to":{"change":6,"start":37451,"end":37533},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1544,"ins":{"up_context":[{"change":6,"pos":405366}],"down_context":[{"change":6,"pos":405389}],"flag":"BLOCK","start":65897,"end":65916,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405366},"to":{"change":6,"start":405366,"end":405389},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1546,"ins":{"up_context":[{"change":6,"pos":405407}],"down_context":[{"change":6,"pos":405451}],"flag":"BLOCK","start":65917,"end":65953,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405407},"to":{"change":6,"start":405407,"end":405451},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1551,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37548}],"down_context":[{"change":6,"pos":405477}],"flag":"BLOCK","start":65954,"end":65976,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1558,"ins":{"up_context":[{"change":6,"pos":405567}],"down_context":[{"change":6,"pos":405605}],"flag":"BLOCK","start":65977,"end":66041,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405567},"to":{"change":6,"start":5777,"end":5839},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_bob.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1562,"ins":{"up_context":[{"change":6,"pos":405722}],"down_context":[{"change":6,"pos":405746}],"flag":"BLOCK","start":66042,"end":66048,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405722},"to":{"change":6,"start":405722,"end":405746},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1564,"ins":{"up_context":[{"change":6,"pos":405770}],"down_context":[{"change":6,"pos":405865}],"flag":"BLOCK","start":66049,"end":66132,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405770},"to":{"change":6,"start":405770,"end":405865},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution_bob = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let resolution_bob = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1566,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":405866},"to":{"change":6,"start":21248,"end":21319},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1570,"ins":{"up_context":[{"change":6,"pos":406026}],"down_context":[{"change":6,"pos":406116}],"flag":"BLOCK","start":66133,"end":66220,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406026},"to":{"change":6,"start":37549,"end":37640},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &resolution_bob).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &resolution_bob).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1572,"ins":{"up_context":[{"change":6,"pos":406158}],"down_context":[{"change":6,"pos":406183}],"flag":"BLOCK","start":66221,"end":66242,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406158},"to":{"change":6,"start":406158,"end":406183},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1574,"ins":{"up_context":[{"change":6,"pos":406201}],"down_context":[{"change":6,"pos":406247}],"flag":"BLOCK","start":66243,"end":66281,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406201},"to":{"change":6,"start":406201,"end":406247},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1579,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37655}],"down_context":[{"change":6,"pos":406273}],"flag":"BLOCK","start":66282,"end":66304,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1582,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406281},"to":{"change":6,"start":21320,"end":21395},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1587,"ins":{"up_context":[{"change":6,"pos":406500}],"down_context":[{"change":6,"pos":406590}],"flag":"BLOCK","start":66305,"end":66392,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406500},"to":{"change":6,"start":37656,"end":37747},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution_alice).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution_alice).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1589,"ins":{"up_context":[{"change":6,"pos":406632}],"down_context":[{"change":6,"pos":406655}],"flag":"BLOCK","start":66393,"end":66412,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406632},"to":{"change":6,"start":406632,"end":406655},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1591,"ins":{"up_context":[{"change":6,"pos":406673}],"down_context":[{"change":6,"pos":406717}],"flag":"BLOCK","start":66413,"end":66449,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":406673},"to":{"change":6,"start":406673,"end":406717},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1596,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37762}],"down_context":[{"change":6,"pos":406743}],"flag":"BLOCK","start":66450,"end":66472,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1614,"ins":{"up_context":[{"change":6,"pos":407243}],"down_context":[{"change":6,"pos":407365}],"flag":"BLOCK","start":66473,"end":66587,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407243},"to":{"change":6,"start":407243,"end":407365},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1619,"ins":{"up_context":[{"change":6,"pos":407484}],"down_context":[{"change":6,"pos":407535}],"flag":"BLOCK","start":66588,"end":66644,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407484},"to":{"change":6,"start":34643,"end":34703},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1621,"ins":{"up_context":[{"change":6,"pos":407597}],"down_context":[{"change":6,"pos":407644}],"flag":"BLOCK","start":66645,"end":66697,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407597},"to":{"change":6,"start":34704,"end":34760},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1623,"ins":{"up_context":[{"change":6,"pos":407645}],"down_context":[{"change":6,"pos":407725}],"flag":"BLOCK","start":66698,"end":66782,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407645},"to":{"change":6,"start":407645,"end":407725},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1626,"ins":{"up_context":[{"change":6,"pos":407747}],"down_context":[{"change":6,"pos":407788}],"flag":"BLOCK","start":66783,"end":66835,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407747},"to":{"change":6,"start":407747,"end":407788},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file\", 0).unwrap();"}],"del_contents":[{"Del":" txn_alice.add_file(\"file\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1632,"ins":{"up_context":[{"change":6,"pos":407969}],"down_context":[{"change":6,"pos":408351}],"flag":"BLOCK","start":66836,"end":66997,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407969},"to":{"change":6,"start":407969,"end":407992},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":407992},"to":{"change":6,"start":5840,"end":5906},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5906},"to":{"change":6,"start":408034,"end":408351},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408034},"to":{"change":6,"start":408034,"end":408351},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file(\"file\").unwrap().write_all(c).unwrap();"},{"Add":" record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap()"}],"del_contents":[{"Del":" repo_alice\n"},{"Del":" .write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(c)?;\n Ok(())\n })\n .unwrap();\n record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1638,"ins":{"up_context":[{"change":6,"pos":408401}],"down_context":[{"change":6,"pos":408563}],"flag":"BLOCK","start":66998,"end":67161,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408401},"to":{"change":6,"start":408401,"end":408475},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408475},"to":{"change":6,"start":37763,"end":37852},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &p_alice[0]).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &p_alice[0]).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1641,"ins":{"up_context":[{"change":6,"pos":408605}],"down_context":[{"change":6,"pos":408628}],"flag":"BLOCK","start":67162,"end":67181,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408605},"to":{"change":6,"start":408605,"end":408628},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1643,"ins":{"up_context":[{"change":6,"pos":408646}],"down_context":[{"change":6,"pos":408694}],"flag":"BLOCK","start":67182,"end":67222,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408646},"to":{"change":6,"start":408646,"end":408694},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1648,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37867}],"down_context":[{"change":6,"pos":408720}],"flag":"BLOCK","start":67223,"end":67245,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1651,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408728},"to":{"change":6,"start":21396,"end":21462},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1654,"ins":{"up_context":[{"change":6,"pos":408873}],"down_context":[{"change":6,"pos":408968}],"flag":"BLOCK","start":67246,"end":67310,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408873},"to":{"change":6,"start":5907,"end":5969},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5969},"to":{"change":6,"start":408911,"end":408968},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":408911},"to":{"change":6,"start":408911,"end":408968},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(b\"x\\nc\\n\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"x\\nc\\n\")?;\n Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1656,"ins":{"up_context":[{"change":6,"pos":409004}],"down_context":[{"change":6,"pos":409158}],"flag":"BLOCK","start":67311,"end":67397,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409004},"to":{"change":6,"start":409004,"end":409102},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409102},"to":{"change":6,"start":21463,"end":21530},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let p_bob = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" let p_bob = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1661,"ins":{"up_context":[{"change":6,"pos":409309}],"down_context":[{"change":6,"pos":27852}],"flag":"BLOCK","start":67398,"end":67477,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409309},"to":{"change":6,"start":37868,"end":37951},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":37951},"to":{"change":6,"start":21531,"end":21617},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409393},"to":{"change":6,"start":21531,"end":21617},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, p).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p).unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), &format!(\"debug_bob_{}\", n))?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1667,"ins":{"up_context":[{"change":6,"pos":409516}],"down_context":[{"change":6,"pos":409539}],"flag":"BLOCK","start":67478,"end":67497,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409516},"to":{"change":6,"start":409516,"end":409539},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1669,"ins":{"up_context":[{"change":6,"pos":409557}],"down_context":[{"change":6,"pos":409605}],"flag":"BLOCK","start":67498,"end":67538,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409557},"to":{"change":6,"start":409557,"end":409605},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1674,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37966}],"down_context":[{"change":6,"pos":409631}],"flag":"BLOCK","start":67539,"end":67561,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1685,"ins":{"up_context":[{"change":6,"pos":409911}],"down_context":[{"change":6,"pos":410173}],"flag":"BLOCK","start":67562,"end":67717,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409911},"to":{"change":6,"start":5970,"end":6032},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6032},"to":{"change":6,"start":409949,"end":410117},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":409949},"to":{"change":6,"start":409949,"end":410117},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":410117},"to":{"change":6,"start":21618,"end":21685},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(b\"x\\nc\\n\")?;"},{"Add":" let resolution = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"x\\nc\\n\")?;\n Ok(())\n })?;\n let resolution =\n record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1688,"ins":{"up_context":[{"change":6,"pos":410215}],"down_context":[{"change":6,"pos":410238}],"flag":"BLOCK","start":67718,"end":67737,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":410215},"to":{"change":6,"start":410215,"end":410238},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1690,"ins":{"up_context":[{"change":6,"pos":410256}],"down_context":[{"change":6,"pos":410304}],"flag":"BLOCK","start":67738,"end":67778,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":410256},"to":{"change":6,"start":410256,"end":410304},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1695,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":37981}],"down_context":[{"change":6,"pos":410330}],"flag":"BLOCK","start":67779,"end":67801,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1704,"ins":{"up_context":[{"change":6,"pos":28017}],"down_context":[{"change":6,"pos":410630}],"flag":"BLOCK","start":67802,"end":67886,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28017},"to":{"change":6,"start":37982,"end":38070},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":38070},"to":{"change":6,"start":21686,"end":21759},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":410568},"to":{"change":6,"start":21686,"end":21759},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &p_bob).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &p_bob).unwrap();\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1706,"ins":{"up_context":[{"change":6,"pos":410672}],"down_context":[{"change":6,"pos":410697}],"flag":"BLOCK","start":67887,"end":67908,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":410672},"to":{"change":6,"start":410672,"end":410697},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1708,"ins":{"up_context":[{"change":6,"pos":410715}],"down_context":[{"change":6,"pos":410767}],"flag":"BLOCK","start":67909,"end":67953,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":410715},"to":{"change":6,"start":410715,"end":410767},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1713,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38085}],"down_context":[{"change":6,"pos":410793}],"flag":"BLOCK","start":67954,"end":67976,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1722,"ins":{"up_context":[{"change":6,"pos":411023}],"down_context":[{"change":6,"pos":411115}],"flag":"BLOCK","start":67977,"end":68066,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":411023},"to":{"change":6,"start":38086,"end":38179},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1724,"ins":{"up_context":[{"change":6,"pos":411157}],"down_context":[{"change":6,"pos":411182}],"flag":"BLOCK","start":68067,"end":68088,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":411157},"to":{"change":6,"start":411157,"end":411182},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1726,"ins":{"up_context":[{"change":6,"pos":411200}],"down_context":[{"change":6,"pos":411252}],"flag":"BLOCK","start":68089,"end":68133,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":411200},"to":{"change":6,"start":411200,"end":411252},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1731,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38194}],"down_context":[{"change":6,"pos":411278}],"flag":"BLOCK","start":68134,"end":68156,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1734,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":411286},"to":{"change":6,"start":21760,"end":21833},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_alice2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1743,"ins":{"up_context":[{"change":6,"pos":411672}],"down_context":[{"change":6,"pos":411794}],"flag":"BLOCK","start":68157,"end":68271,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":411672},"to":{"change":6,"start":411672,"end":411794},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"},{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1748,"ins":{"up_context":[{"change":6,"pos":411913}],"down_context":[{"change":6,"pos":411964}],"flag":"BLOCK","start":68272,"end":68328,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":411913},"to":{"change":6,"start":34761,"end":34821},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1750,"ins":{"up_context":[{"change":6,"pos":412026}],"down_context":[{"change":6,"pos":412073}],"flag":"BLOCK","start":68329,"end":68381,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412026},"to":{"change":6,"start":34822,"end":34878},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1752,"ins":{"up_context":[{"change":6,"pos":412074}],"down_context":[{"change":6,"pos":412154}],"flag":"BLOCK","start":68382,"end":68466,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412074},"to":{"change":6,"start":412074,"end":412154},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\").unwrap();"}],"del_contents":[{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1755,"ins":{"up_context":[{"change":6,"pos":412176}],"down_context":[{"change":6,"pos":412217}],"flag":"BLOCK","start":68467,"end":68519,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412176},"to":{"change":6,"start":412176,"end":412217},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn_alice.write().add_file(\"file\", 0).unwrap();"}],"del_contents":[{"Del":" txn_alice.add_file(\"file\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1761,"ins":{"up_context":[{"change":6,"pos":412374}],"down_context":[{"change":6,"pos":412756}],"flag":"BLOCK","start":68520,"end":68681,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412374},"to":{"change":6,"start":412374,"end":412397},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412397},"to":{"change":6,"start":6033,"end":6099},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6099},"to":{"change":6,"start":412439,"end":412756},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412439},"to":{"change":6,"start":412439,"end":412756},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice.write_file(\"file\").unwrap().write_all(c).unwrap();"},{"Add":" record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\").unwrap()"}],"del_contents":[{"Del":" repo_alice\n"},{"Del":" .write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(c)?;\n Ok(())\n })\n .unwrap();\n record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )\n .unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1767,"ins":{"up_context":[{"change":6,"pos":412806}],"down_context":[{"change":6,"pos":412968}],"flag":"BLOCK","start":68682,"end":68845,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412806},"to":{"change":6,"start":412806,"end":412880},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":412880},"to":{"change":6,"start":38195,"end":38284},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\").unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &p_alice[0]).unwrap();"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &p_alice[0]).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1770,"ins":{"up_context":[{"change":6,"pos":413010}],"down_context":[{"change":6,"pos":413033}],"flag":"BLOCK","start":68846,"end":68865,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413010},"to":{"change":6,"start":413010,"end":413033},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1772,"ins":{"up_context":[{"change":6,"pos":413051}],"down_context":[{"change":6,"pos":413099}],"flag":"BLOCK","start":68866,"end":68906,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413051},"to":{"change":6,"start":413051,"end":413099},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1777,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38299}],"down_context":[{"change":6,"pos":413125}],"flag":"BLOCK","start":68907,"end":68929,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1783,"ins":{"up_context":[{"change":6,"pos":413223}],"down_context":[{"change":6,"pos":413487}],"flag":"BLOCK","start":68930,"end":69139,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413223},"to":{"change":6,"start":6100,"end":6162},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6162},"to":{"change":6,"start":413261,"end":413431},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413261},"to":{"change":6,"start":413261,"end":413431},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413431},"to":{"change":6,"start":21834,"end":21901},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\nb\\nx\\ny\\nz\\nc\\nd\\n\")"},{"Add":" .unwrap();"},{"Add":" let p_bob = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"a\\nb\\nx\\ny\\nz\\nc\\nd\\n\")?;\n Ok(())\n })?;\n let p_bob = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1792,"ins":{"up_context":[{"change":6,"pos":413565}],"down_context":[{"change":6,"pos":413649}],"flag":"BLOCK","start":69140,"end":69219,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413565},"to":{"change":6,"start":38300,"end":38383},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, p).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, p).unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1794,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413655},"to":{"change":6,"start":21902,"end":21969},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1795,"ins":{"up_context":[{"change":6,"pos":413753}],"down_context":[{"change":6,"pos":413776}],"flag":"BLOCK","start":69220,"end":69239,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413753},"to":{"change":6,"start":413753,"end":413776},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1797,"ins":{"up_context":[{"change":6,"pos":413794}],"down_context":[{"change":6,"pos":413842}],"flag":"BLOCK","start":69240,"end":69280,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413794},"to":{"change":6,"start":413794,"end":413842},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1802,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38398}],"down_context":[{"change":6,"pos":413868}],"flag":"BLOCK","start":69281,"end":69303,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1805,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":413876},"to":{"change":6,"start":21970,"end":22038},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob1_\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1812,"ins":{"up_context":[{"change":6,"pos":414157}],"down_context":[{"change":6,"pos":414366}],"flag":"BLOCK","start":69304,"end":69489,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414157},"to":{"change":6,"start":6163,"end":6225},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6225},"to":{"change":6,"start":414195,"end":414366},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414195},"to":{"change":6,"start":414195,"end":414366},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(b\"a\\nz\\nd\\n\")?;"},{"Add":" let resolution = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(b\"a\\nz\\nd\\n\")?;\n Ok(())\n })?;\n let resolution =\n record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1818,"ins":{"up_context":[{"change":6,"pos":414408}],"down_context":[{"change":6,"pos":414431}],"flag":"BLOCK","start":69490,"end":69509,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414408},"to":{"change":6,"start":414408,"end":414431},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1820,"ins":{"up_context":[{"change":6,"pos":414449}],"down_context":[{"change":6,"pos":414497}],"flag":"BLOCK","start":69510,"end":69550,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414449},"to":{"change":6,"start":414449,"end":414497},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1825,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38413}],"down_context":[{"change":6,"pos":414523}],"flag":"BLOCK","start":69551,"end":69573,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1828,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414531},"to":{"change":6,"start":22039,"end":22106},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1833,"ins":{"up_context":[{"change":6,"pos":414733}],"down_context":[{"change":6,"pos":414912}],"flag":"BLOCK","start":69574,"end":69747,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414733},"to":{"change":6,"start":38414,"end":38595},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &p_bob).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &p_bob).unwrap();\n apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1836,"ins":{"up_context":[{"change":6,"pos":414954}],"down_context":[{"change":6,"pos":414979}],"flag":"BLOCK","start":69748,"end":69769,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414954},"to":{"change":6,"start":414954,"end":414979},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1838,"ins":{"up_context":[{"change":6,"pos":414997}],"down_context":[{"change":6,"pos":415049}],"flag":"BLOCK","start":69770,"end":69814,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":414997},"to":{"change":6,"start":414997,"end":415049},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1843,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38610}],"down_context":[{"change":6,"pos":415075}],"flag":"BLOCK","start":69815,"end":69837,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1862,"ins":{"up_context":[{"change":6,"pos":415534}],"down_context":[{"change":6,"pos":415596}],"flag":"BLOCK","start":69838,"end":69896,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":415534},"to":{"change":6,"start":415534,"end":415596},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1867,"ins":{"up_context":[{"change":6,"pos":415761}],"down_context":[{"change":6,"pos":416046}],"flag":"BLOCK","start":69897,"end":70128,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":415761},"to":{"change":6,"start":34879,"end":34927},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34927},"to":{"change":6,"start":415800,"end":415984},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":415800},"to":{"change":6,"start":415800,"end":415984},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":415984},"to":{"change":6,"start":22107,"end":22180},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1873,"ins":{"up_context":[{"change":6,"pos":416065}],"down_context":[{"change":6,"pos":416259}],"flag":"BLOCK","start":70129,"end":70320,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416065},"to":{"change":6,"start":416065,"end":416187},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416187},"to":{"change":6,"start":38611,"end":38684},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1877,"ins":{"up_context":[{"change":6,"pos":416301}],"down_context":[{"change":6,"pos":416324}],"flag":"BLOCK","start":70321,"end":70340,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416301},"to":{"change":6,"start":416301,"end":416324},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1879,"ins":{"up_context":[{"change":6,"pos":416342}],"down_context":[{"change":6,"pos":416386}],"flag":"BLOCK","start":70341,"end":70377,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416342},"to":{"change":6,"start":416342,"end":416386},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1884,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38699}],"down_context":[{"change":6,"pos":416412}],"flag":"BLOCK","start":70378,"end":70400,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1895,"ins":{"up_context":[{"change":6,"pos":416649}],"down_context":[{"change":6,"pos":416859}],"flag":"BLOCK","start":70401,"end":70608,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416649},"to":{"change":6,"start":416649,"end":416783},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416783},"to":{"change":6,"start":38700,"end":38777},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let channel_charlie = txn.write().open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_charlie = working_copy::memory::Memory::new();\n let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1899,"ins":{"up_context":[{"change":6,"pos":416901}],"down_context":[{"change":6,"pos":416928}],"flag":"BLOCK","start":70609,"end":70632,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416901},"to":{"change":6,"start":416901,"end":416928},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1901,"ins":{"up_context":[{"change":6,"pos":416946}],"down_context":[{"change":6,"pos":416994}],"flag":"BLOCK","start":70633,"end":70673,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":416946},"to":{"change":6,"start":416946,"end":416994},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1906,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38792}],"down_context":[{"change":6,"pos":417020}],"flag":"BLOCK","start":70674,"end":70696,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1911,"ins":{"up_context":[{"change":6,"pos":417055}],"down_context":[{"change":6,"pos":417312}],"flag":"BLOCK","start":70697,"end":70883,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417055},"to":{"change":6,"start":6226,"end":6290},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6290},"to":{"change":6,"start":417095,"end":417248},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417095},"to":{"change":6,"start":417095,"end":417248},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417248},"to":{"change":6,"start":22181,"end":22256},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1919,"ins":{"up_context":[{"change":6,"pos":417345}],"down_context":[{"change":6,"pos":417588}],"flag":"BLOCK","start":70884,"end":71024,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417345},"to":{"change":6,"start":6291,"end":6353},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6353},"to":{"change":6,"start":417383,"end":417528},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417383},"to":{"change":6,"start":417383,"end":417528},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417528},"to":{"change":6,"start":22257,"end":22328},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1923,"ins":{"up_context":[{"change":6,"pos":417630}],"down_context":[{"change":6,"pos":417941}],"flag":"BLOCK","start":71025,"end":71205,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417630},"to":{"change":6,"start":6354,"end":6420},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6420},"to":{"change":6,"start":417672,"end":417864},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417672},"to":{"change":6,"start":417672,"end":417864},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417864},"to":{"change":6,"start":22329,"end":22408},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_charlie"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(charlie)"},{"Add":" .unwrap();"},{"Add":" record_all(&repo_charlie, &changes, &txn, &channel_charlie, \"\")?;"}],"del_contents":[{"Del":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(charlie).unwrap();\n Ok(())\n })?;\n record_all(\n &mut repo_charlie,\n &changes,\n &mut txn,\n &mut channel_charlie,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1931,"ins":{"up_context":[{"change":6,"pos":417976}],"down_context":[{"change":6,"pos":418049}],"flag":"BLOCK","start":71206,"end":71276,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":417976},"to":{"change":6,"start":38793,"end":38867},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1933,"ins":{"up_context":[{"change":6,"pos":418091}],"down_context":[{"change":6,"pos":418116}],"flag":"BLOCK","start":71277,"end":71298,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418091},"to":{"change":6,"start":418091,"end":418116},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1935,"ins":{"up_context":[{"change":6,"pos":418134}],"down_context":[{"change":6,"pos":418180}],"flag":"BLOCK","start":71299,"end":71337,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418134},"to":{"change":6,"start":418134,"end":418180},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1940,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38882}],"down_context":[{"change":6,"pos":418206}],"flag":"BLOCK","start":71338,"end":71360,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1946,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418344},"to":{"change":6,"start":22409,"end":22484},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1948,"ins":{"up_context":[{"change":6,"pos":418443}],"down_context":[{"change":6,"pos":418512}],"flag":"BLOCK","start":71361,"end":71471,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418443},"to":{"change":6,"start":6421,"end":6514},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice_bob)"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| Ok(w.write_all(alice_bob)?))?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1954,"ins":{"up_context":[{"change":6,"pos":418513}],"down_context":[{"change":6,"pos":418608}],"flag":"BLOCK","start":71472,"end":71555,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418513},"to":{"change":6,"start":418513,"end":418608},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let resolution = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let resolution = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1956,"ins":{"up_context":[{"change":6,"pos":418650}],"down_context":[{"change":6,"pos":418675}],"flag":"BLOCK","start":71556,"end":71577,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418650},"to":{"change":6,"start":418650,"end":418675},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1958,"ins":{"up_context":[{"change":6,"pos":418693}],"down_context":[{"change":6,"pos":418739}],"flag":"BLOCK","start":71578,"end":71616,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418693},"to":{"change":6,"start":418693,"end":418739},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1963,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":38897}],"down_context":[{"change":6,"pos":418765}],"flag":"BLOCK","start":71617,"end":71639,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1966,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418773},"to":{"change":6,"start":22485,"end":22560},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1968,"ins":{"up_context":[{"change":6,"pos":418887}],"down_context":[{"change":6,"pos":419096}],"flag":"BLOCK","start":71640,"end":71783,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":418887},"to":{"change":6,"start":38898,"end":39049},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":39049},"to":{"change":6,"start":22561,"end":22632},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":419036},"to":{"change":6,"start":22561,"end":22632},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_bob, &resolution)?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1979,"ins":{"up_context":[{"change":6,"pos":419271}],"down_context":[{"change":6,"pos":419734}],"flag":"BLOCK","start":71784,"end":72007,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":419271},"to":{"change":6,"start":39050,"end":39126},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":39126},"to":{"change":6,"start":22633,"end":22712},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":419346},"to":{"change":6,"start":22633,"end":22712},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22712},"to":{"change":6,"start":39127,"end":39205},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":39205},"to":{"change":6,"start":22713,"end":22792},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":419500},"to":{"change":6,"start":22713,"end":22792},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22792},"to":{"change":6,"start":39206,"end":39287},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":39287},"to":{"change":6,"start":22793,"end":22872},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":419657},"to":{"change":6,"start":22793,"end":22872},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &bob_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &alice_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &resolution)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h)?;\n"},{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie1\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h)?;\n"},{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie2\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &resolution)?;\n"},{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":1995,"ins":{"up_context":[{"change":6,"pos":420057}],"down_context":[{"change":6,"pos":420119}],"flag":"BLOCK","start":72008,"end":72066,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420057},"to":{"change":6,"start":420057,"end":420119},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2000,"ins":{"up_context":[{"change":6,"pos":420284}],"down_context":[{"change":6,"pos":420569}],"flag":"BLOCK","start":72067,"end":72302,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420284},"to":{"change":6,"start":34928,"end":34976},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":34976},"to":{"change":6,"start":420323,"end":420507},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420323},"to":{"change":6,"start":420323,"end":420507},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420507},"to":{"change":6,"start":22873,"end":22946},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2007,"ins":{"up_context":[{"change":6,"pos":420648}],"down_context":[{"change":6,"pos":420782}],"flag":"BLOCK","start":72303,"end":72442,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420648},"to":{"change":6,"start":420648,"end":420710},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420710},"to":{"change":6,"start":39288,"end":39361},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2010,"ins":{"up_context":[{"change":6,"pos":420824}],"down_context":[{"change":6,"pos":420847}],"flag":"BLOCK","start":72443,"end":72462,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420824},"to":{"change":6,"start":420824,"end":420847},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2012,"ins":{"up_context":[{"change":6,"pos":420865}],"down_context":[{"change":6,"pos":420909}],"flag":"BLOCK","start":72463,"end":72499,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":420865},"to":{"change":6,"start":420865,"end":420909},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2017,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39376}],"down_context":[{"change":6,"pos":420935}],"flag":"BLOCK","start":72500,"end":72522,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2028,"ins":{"up_context":[{"change":6,"pos":421205}],"down_context":[{"change":6,"pos":421415}],"flag":"BLOCK","start":72523,"end":72730,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421205},"to":{"change":6,"start":421205,"end":421339},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421339},"to":{"change":6,"start":39377,"end":39454},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let channel_charlie = txn.write().open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_charlie = working_copy::memory::Memory::new();\n let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2032,"ins":{"up_context":[{"change":6,"pos":421457}],"down_context":[{"change":6,"pos":421484}],"flag":"BLOCK","start":72731,"end":72754,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421457},"to":{"change":6,"start":421457,"end":421484},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2034,"ins":{"up_context":[{"change":6,"pos":421502}],"down_context":[{"change":6,"pos":421550}],"flag":"BLOCK","start":72755,"end":72795,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421502},"to":{"change":6,"start":421502,"end":421550},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2039,"ins":{"up_context":[{"change":6,"pos":39469}],"down_context":[{"change":6,"pos":421826}],"flag":"BLOCK","start":72796,"end":72818,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":39469},"to":{"change":6,"start":421576,"end":421584},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421576},"to":{"change":6,"start":421576,"end":421584},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421584},"to":{"change":6,"start":6515,"end":6581},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6581},"to":{"change":6,"start":421626,"end":421826},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":421626},"to":{"change":6,"start":421626,"end":421826},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" 1,"},{"Add":" 0,"}],"del_contents":[{"Del":" )?;\n"},{"Del":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(charlie).unwrap();\n Ok(())\n })?;\n let charlie_h = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn,\n &mut channel_charlie,\n \"\",\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2042,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":421834}],"down_context":[{"change":6,"pos":421834}],"flag":"BLOCK","start":72819,"end":73015,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" repo_charlie"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(charlie)"},{"Add":" .unwrap();"},{"Add":" let charlie_h = record_all(&repo_charlie, &changes, &txn, &channel_charlie, \"\")?;"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2056,"ins":{"up_context":[{"change":6,"pos":422082}],"down_context":[{"change":6,"pos":422447}],"flag":"BLOCK","start":73016,"end":73156,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422082},"to":{"change":6,"start":6582,"end":6644},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6644},"to":{"change":6,"start":422120,"end":422179},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422120},"to":{"change":6,"start":422120,"end":422179},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422179},"to":{"change":6,"start":22947,"end":23091},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":23091},"to":{"change":6,"start":422301,"end":422387},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29252},"to":{"change":6,"start":422301,"end":422387},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422301},"to":{"change":6,"start":422301,"end":422387},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422387},"to":{"change":6,"start":23092,"end":23163},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice\").unwrap();\n debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob\").unwrap();\n"},{"Del":" let bob_h = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2060,"ins":{"up_context":[{"change":6,"pos":422479}],"down_context":[{"change":6,"pos":422736}],"flag":"BLOCK","start":73157,"end":73343,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422479},"to":{"change":6,"start":6645,"end":6709},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6709},"to":{"change":6,"start":422519,"end":422672},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422519},"to":{"change":6,"start":422519,"end":422672},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422672},"to":{"change":6,"start":23164,"end":23239},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2068,"ins":{"up_context":[{"change":6,"pos":422771}],"down_context":[{"change":6,"pos":422844}],"flag":"BLOCK","start":73344,"end":73414,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422771},"to":{"change":6,"start":39470,"end":39544},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2070,"ins":{"up_context":[{"change":6,"pos":422886}],"down_context":[{"change":6,"pos":422911}],"flag":"BLOCK","start":73415,"end":73436,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422886},"to":{"change":6,"start":422886,"end":422911},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2072,"ins":{"up_context":[{"change":6,"pos":422929}],"down_context":[{"change":6,"pos":422975}],"flag":"BLOCK","start":73437,"end":73475,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":422929},"to":{"change":6,"start":422929,"end":422975},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2077,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39559}],"down_context":[{"change":6,"pos":423001}],"flag":"BLOCK","start":73476,"end":73498,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2083,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423138},"to":{"change":6,"start":23240,"end":23315},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2086,"ins":{"up_context":[{"change":6,"pos":423310}],"down_context":[{"change":6,"pos":423350}],"flag":"BLOCK","start":73499,"end":73565,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423310},"to":{"change":6,"start":6710,"end":6774},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2093,"ins":{"up_context":[{"change":6,"pos":423477}],"down_context":[{"change":6,"pos":423501}],"flag":"BLOCK","start":73566,"end":73572,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423477},"to":{"change":6,"start":423477,"end":423501},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2095,"ins":{"up_context":[{"change":6,"pos":423525}],"down_context":[{"change":6,"pos":423699}],"flag":"BLOCK","start":73573,"end":73663,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423525},"to":{"change":6,"start":423525,"end":423635},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423635},"to":{"change":6,"start":23316,"end":23391},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let alices_resolution = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let alices_resolution =\n record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2098,"ins":{"up_context":[{"change":6,"pos":423734}],"down_context":[{"change":6,"pos":423815}],"flag":"BLOCK","start":73664,"end":73742,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423734},"to":{"change":6,"start":39560,"end":39642},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2100,"ins":{"up_context":[{"change":6,"pos":423857}],"down_context":[{"change":6,"pos":423880}],"flag":"BLOCK","start":73743,"end":73762,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423857},"to":{"change":6,"start":423857,"end":423880},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2102,"ins":{"up_context":[{"change":6,"pos":423898}],"down_context":[{"change":6,"pos":423942}],"flag":"BLOCK","start":73763,"end":73799,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423898},"to":{"change":6,"start":423898,"end":423942},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2107,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39657}],"down_context":[{"change":6,"pos":423968}],"flag":"BLOCK","start":73800,"end":73822,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2110,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":423976},"to":{"change":6,"start":23392,"end":23463},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2114,"ins":{"up_context":[{"change":6,"pos":424221}],"down_context":[{"change":6,"pos":424259}],"flag":"BLOCK","start":73823,"end":73887,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424221},"to":{"change":6,"start":6775,"end":6837},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_bob.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2121,"ins":{"up_context":[{"change":6,"pos":424386}],"down_context":[{"change":6,"pos":424410}],"flag":"BLOCK","start":73888,"end":73894,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424386},"to":{"change":6,"start":424386,"end":424410},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2123,"ins":{"up_context":[{"change":6,"pos":424434}],"down_context":[{"change":6,"pos":424531}],"flag":"BLOCK","start":73895,"end":73980,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424434},"to":{"change":6,"start":424434,"end":424531},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let _bobs_resolution = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let _bobs_resolution = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2126,"ins":{"up_context":[{"change":6,"pos":424570}],"down_context":[{"change":6,"pos":424661}],"flag":"BLOCK","start":73981,"end":74069,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424570},"to":{"change":6,"start":39658,"end":39750},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alices_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alices_resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2128,"ins":{"up_context":[{"change":6,"pos":424695}],"down_context":[{"change":6,"pos":424838}],"flag":"BLOCK","start":74070,"end":74150,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424695},"to":{"change":6,"start":39751,"end":39835},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":39835},"to":{"change":6,"start":23464,"end":23535},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424778},"to":{"change":6,"start":23464,"end":23535},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &charlie_h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &charlie_h).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2131,"ins":{"up_context":[{"change":6,"pos":424911}],"down_context":[{"change":6,"pos":424934}],"flag":"BLOCK","start":74151,"end":74170,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424911},"to":{"change":6,"start":424911,"end":424934},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2133,"ins":{"up_context":[{"change":6,"pos":424952}],"down_context":[{"change":6,"pos":424996}],"flag":"BLOCK","start":74171,"end":74207,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":424952},"to":{"change":6,"start":424952,"end":424996},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2138,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39850}],"down_context":[{"change":6,"pos":425022}],"flag":"BLOCK","start":74208,"end":74230,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2141,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":425030},"to":{"change":6,"start":23536,"end":23607},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2148,"ins":{"up_context":[{"change":6,"pos":425443}],"down_context":[{"change":6,"pos":425481}],"flag":"BLOCK","start":74231,"end":74295,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":425443},"to":{"change":6,"start":6838,"end":6900},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_bob.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2155,"ins":{"up_context":[{"change":6,"pos":425608}],"down_context":[{"change":6,"pos":425632}],"flag":"BLOCK","start":74296,"end":74302,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":425608},"to":{"change":6,"start":425608,"end":425632},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2166,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39865}],"down_context":[{"change":6,"pos":425914}],"flag":"BLOCK","start":74303,"end":74325,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2171,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":425982},"to":{"change":6,"start":23608,"end":23679},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob4\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2176,"ins":{"up_context":[{"change":6,"pos":426171}],"down_context":[{"change":6,"pos":426269}],"flag":"BLOCK","start":74326,"end":74484,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":426171},"to":{"change":6,"start":426171,"end":426269},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" crate::unrecord::unrecord("},{"Add":" &mut *txn.write(),"},{"Add":" &channel_bob,"},{"Add":" &changes,"},{"Add":" &second_resolution,"},{"Add":" 0,"},{"Add":" )"},{"Add":" .unwrap();"}],"del_contents":[{"Del":" crate::unrecord::unrecord(&mut txn, &mut channel_bob, &changes, &second_resolution).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2185,"ins":{"up_context":[{"change":6,"pos":426311}],"down_context":[{"change":6,"pos":426334}],"flag":"BLOCK","start":74485,"end":74504,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":426311},"to":{"change":6,"start":426311,"end":426334},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2187,"ins":{"up_context":[{"change":6,"pos":426352}],"down_context":[{"change":6,"pos":426396}],"flag":"BLOCK","start":74505,"end":74541,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":426352},"to":{"change":6,"start":426352,"end":426396},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2192,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39880}],"down_context":[{"change":6,"pos":426422}],"flag":"BLOCK","start":74542,"end":74564,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2195,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":426430},"to":{"change":6,"start":23680,"end":23751},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob5\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2222,"ins":{"up_context":[{"change":6,"pos":427320}],"down_context":[{"change":6,"pos":427605}],"flag":"BLOCK","start":74565,"end":74804,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427320},"to":{"change":6,"start":34977,"end":35025},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35025},"to":{"change":6,"start":427359,"end":427543},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427359},"to":{"change":6,"start":427359,"end":427543},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427543},"to":{"change":6,"start":23752,"end":23825},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut txn = env.arc_txn_begin().unwrap();"},{"Add":" let mut channel_alice = txn.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn.open_or_create_channel(\"alice\")?;\n txn.add_file(\"file\")?;\n let init_h = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2228,"ins":{"up_context":[{"change":6,"pos":427624}],"down_context":[{"change":6,"pos":427818}],"flag":"BLOCK","start":74805,"end":74996,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427624},"to":{"change":6,"start":427624,"end":427746},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427746},"to":{"change":6,"start":39881,"end":39954},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" let channel_bob = txn.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n let mut channel_bob = txn.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2232,"ins":{"up_context":[{"change":6,"pos":427860}],"down_context":[{"change":6,"pos":427883}],"flag":"BLOCK","start":74997,"end":75016,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427860},"to":{"change":6,"start":427860,"end":427883},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2234,"ins":{"up_context":[{"change":6,"pos":427901}],"down_context":[{"change":6,"pos":427945}],"flag":"BLOCK","start":75017,"end":75053,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":427901},"to":{"change":6,"start":427901,"end":427945},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2239,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":39969}],"down_context":[{"change":6,"pos":427971}],"flag":"BLOCK","start":75054,"end":75076,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2250,"ins":{"up_context":[{"change":6,"pos":428215}],"down_context":[{"change":6,"pos":428829}],"flag":"BLOCK","start":75077,"end":75574,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428215},"to":{"change":6,"start":6901,"end":6963},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":6963},"to":{"change":6,"start":428253,"end":428399},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428253},"to":{"change":6,"start":428253,"end":428399},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428399},"to":{"change":6,"start":6964,"end":7026},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7026},"to":{"change":6,"start":428437,"end":428584},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428437},"to":{"change":6,"start":428437,"end":428584},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428584},"to":{"change":6,"start":7027,"end":7089},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7089},"to":{"change":6,"start":428622,"end":428769},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428622},"to":{"change":6,"start":428622,"end":428769},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428769},"to":{"change":6,"start":23826,"end":23897},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_bob.write_file(\"file\").unwrap().write_all(bob).unwrap();"},{"Add":" let bob_h1 = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"},{"Add":" repo_bob"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(bob2)"},{"Add":" .unwrap();"},{"Add":" let bob_h2 = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"},{"Add":" repo_bob"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(bob3)"},{"Add":" .unwrap();"},{"Add":" let bob_h3 = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob).unwrap();\n Ok(())\n })?;\n let bob_h1 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob2).unwrap();\n Ok(())\n })?;\n let bob_h2 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(bob3).unwrap();\n Ok(())\n })?;\n let bob_h3 = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2266,"ins":{"up_context":[{"change":6,"pos":428861}],"down_context":[{"change":6,"pos":429509}],"flag":"BLOCK","start":75575,"end":76138,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428861},"to":{"change":6,"start":7090,"end":7154},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7154},"to":{"change":6,"start":428901,"end":429055},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":428901},"to":{"change":6,"start":428901,"end":429055},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429055},"to":{"change":6,"start":7155,"end":7219},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7219},"to":{"change":6,"start":429095,"end":429250},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429095},"to":{"change":6,"start":429095,"end":429250},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429250},"to":{"change":6,"start":7220,"end":7284},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7284},"to":{"change":6,"start":429290,"end":429445},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429290},"to":{"change":6,"start":429290,"end":429445},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429445},"to":{"change":6,"start":23898,"end":23973},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice)"},{"Add":" .unwrap();"},{"Add":" let alice_h1 = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"},{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice2)"},{"Add":" .unwrap();"},{"Add":" let alice_h2 = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"},{"Add":" repo_alice"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(alice3)"},{"Add":" .unwrap();"},{"Add":" let alice_h3 = record_all(&repo_alice, &changes, &txn, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice).unwrap();\n Ok(())\n })?;\n let alice_h1 = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice2).unwrap();\n Ok(())\n })?;\n let alice_h2 = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(alice3).unwrap();\n Ok(())\n })?;\n let alice_h3 = record_all(&mut repo_alice, &changes, &mut txn, &mut channel_alice, \"\")?;\n"},{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2286,"ins":{"up_context":[{"change":6,"pos":429544}],"down_context":[{"change":6,"pos":429766}],"flag":"BLOCK","start":76139,"end":76352,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429544},"to":{"change":6,"start":39970,"end":40195},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h1)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h2)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_alice, &bob_h3)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h1)?;\n apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel_alice, &bob_h3)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2290,"ins":{"up_context":[{"change":6,"pos":429808}],"down_context":[{"change":6,"pos":429833}],"flag":"BLOCK","start":76353,"end":76374,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429808},"to":{"change":6,"start":429808,"end":429833},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2292,"ins":{"up_context":[{"change":6,"pos":429851}],"down_context":[{"change":6,"pos":429897}],"flag":"BLOCK","start":76375,"end":76413,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":429851},"to":{"change":6,"start":429851,"end":429897},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2297,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":40210}],"down_context":[{"change":6,"pos":429923}],"flag":"BLOCK","start":76414,"end":76436,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2303,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430060},"to":{"change":6,"start":23974,"end":24049},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2306,"ins":{"up_context":[{"change":6,"pos":430232}],"down_context":[{"change":6,"pos":430272}],"flag":"BLOCK","start":76437,"end":76503,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430232},"to":{"change":6,"start":7285,"end":7349},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_alice.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_alice.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2313,"ins":{"up_context":[{"change":6,"pos":430399}],"down_context":[{"change":6,"pos":430423}],"flag":"BLOCK","start":76504,"end":76510,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430399},"to":{"change":6,"start":430399,"end":430423},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2317,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430557},"to":{"change":6,"start":24050,"end":24125},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_alice.borrow(), \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2319,"ins":{"up_context":[{"change":6,"pos":430656}],"down_context":[{"change":6,"pos":430902}],"flag":"BLOCK","start":76511,"end":76748,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430656},"to":{"change":6,"start":40211,"end":40460},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h1).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h2).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alice_h3).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h1).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h2).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_bob, &alice_h3).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2323,"ins":{"up_context":[{"change":6,"pos":430944}],"down_context":[{"change":6,"pos":430967}],"flag":"BLOCK","start":76749,"end":76768,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430944},"to":{"change":6,"start":430944,"end":430967},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2325,"ins":{"up_context":[{"change":6,"pos":430985}],"down_context":[{"change":6,"pos":431029}],"flag":"BLOCK","start":76769,"end":76805,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":430985},"to":{"change":6,"start":430985,"end":431029},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2330,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":40475}],"down_context":[{"change":6,"pos":431055}],"flag":"BLOCK","start":76806,"end":76828,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2333,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":431063},"to":{"change":6,"start":24126,"end":24197},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2337,"ins":{"up_context":[{"change":6,"pos":431308}],"down_context":[{"change":6,"pos":431346}],"flag":"BLOCK","start":76829,"end":76893,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":431308},"to":{"change":6,"start":7350,"end":7412},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" {"},{"Add":" let mut w = repo_bob.write_file(\"file\").unwrap();"}],"del_contents":[{"Del":" repo_bob.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2344,"ins":{"up_context":[{"change":6,"pos":431473}],"down_context":[{"change":6,"pos":431497}],"flag":"BLOCK","start":76894,"end":76900,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":431473},"to":{"change":6,"start":431473,"end":431497},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" Ok(())\n })?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2347,"ins":{"up_context":[{"change":6,"pos":431552}],"down_context":[{"change":6,"pos":431648}],"flag":"BLOCK","start":76901,"end":76985,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":431552},"to":{"change":6,"start":431552,"end":431648},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let bobs_resolution = record_all(&repo_bob, &changes, &txn, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let bobs_resolution = record_all(&mut repo_bob, &changes, &mut txn, &mut channel_bob, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2350,"ins":{"up_context":[{"change":6,"pos":431683}],"down_context":[{"change":6,"pos":432355}],"flag":"BLOCK","start":76986,"end":77637,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":431683},"to":{"change":6,"start":431683,"end":431817},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":431817},"to":{"change":6,"start":40476,"end":41021},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_charlie = working_copy::memory::Memory::new();"},{"Add":" let channel_charlie = txn.write().open_or_create_channel(\"charlie\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &init_h)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &alice_h1)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &alice_h2)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &alice_h3)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &bob_h1)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &bob_h2)?;"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &bob_h3)?;"}],"del_contents":[{"Del":" let mut repo_charlie = working_copy::memory::Memory::new();\n let mut channel_charlie = txn.open_or_create_channel(\"charlie\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &init_h)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h1)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alice_h3)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h1)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h2)?;\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bob_h3)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2360,"ins":{"up_context":[{"change":6,"pos":432397}],"down_context":[{"change":6,"pos":432424}],"flag":"BLOCK","start":77638,"end":77661,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":432397},"to":{"change":6,"start":432397,"end":432424},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2362,"ins":{"up_context":[{"change":6,"pos":432442}],"down_context":[{"change":6,"pos":432490}],"flag":"BLOCK","start":77662,"end":77702,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":432442},"to":{"change":6,"start":432442,"end":432490},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2367,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41036}],"down_context":[{"change":6,"pos":432516}],"flag":"BLOCK","start":77703,"end":77725,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2370,"ins":{"up_context":[{"change":6,"pos":432524}],"down_context":[{"change":6,"pos":432774}],"flag":"BLOCK","start":77726,"end":77922,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":432524},"to":{"change":6,"start":7413,"end":7479},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7479},"to":{"change":6,"start":432566,"end":432774},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":432566},"to":{"change":6,"start":432566,"end":432774},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" repo_charlie"},{"Add":" .write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(charlie)"},{"Add":" .unwrap();"},{"Add":" let charlie_h = record_all(&repo_charlie, &changes, &txn, &channel_charlie, \"\")?;"}],"del_contents":[{"Del":" repo_charlie.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(charlie).unwrap();\n Ok(())\n })?;\n let charlie_h = record_all(\n &mut repo_charlie,\n &changes,\n &mut txn,\n &mut channel_charlie,\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2378,"ins":{"up_context":[{"change":6,"pos":432813}],"down_context":[{"change":6,"pos":432964}],"flag":"BLOCK","start":77923,"end":78011,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":432813},"to":{"change":6,"start":41037,"end":41129},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":41129},"to":{"change":6,"start":24198,"end":24269},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":432904},"to":{"change":6,"start":24198,"end":24269},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &alices_resolution).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &alices_resolution).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2381,"ins":{"up_context":[{"change":6,"pos":433037}],"down_context":[{"change":6,"pos":433060}],"flag":"BLOCK","start":78012,"end":78031,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433037},"to":{"change":6,"start":433037,"end":433060},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2383,"ins":{"up_context":[{"change":6,"pos":433078}],"down_context":[{"change":6,"pos":433122}],"flag":"BLOCK","start":78032,"end":78068,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433078},"to":{"change":6,"start":433078,"end":433122},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2388,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41144}],"down_context":[{"change":6,"pos":433148}],"flag":"BLOCK","start":78069,"end":78091,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2391,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433156},"to":{"change":6,"start":24270,"end":24341},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2396,"ins":{"up_context":[{"change":6,"pos":433351}],"down_context":[{"change":6,"pos":433556}],"flag":"BLOCK","start":78092,"end":78257,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433351},"to":{"change":6,"start":41145,"end":41229},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":41229},"to":{"change":6,"start":24342,"end":24413},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433434},"to":{"change":6,"start":24342,"end":24413},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24413},"to":{"change":6,"start":28828,"end":28907},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30412},"to":{"change":6,"start":28828,"end":28907},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_bob, &charlie_h).unwrap();"},{"Add":" let (alive_, reachable_) = check_alive(&*txn.read(), &channel_bob.read().graph);"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_bob, &charlie_h).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob4\").unwrap();\n"},{"Del":" let (alive_, reachable_) = check_alive(&txn, &channel_bob.borrow().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2406,"ins":{"up_context":[{"change":6,"pos":433807}],"down_context":[{"change":6,"pos":433830}],"flag":"BLOCK","start":78258,"end":78277,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433807},"to":{"change":6,"start":433807,"end":433830},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2408,"ins":{"up_context":[{"change":6,"pos":433848}],"down_context":[{"change":6,"pos":433892}],"flag":"BLOCK","start":78278,"end":78314,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433848},"to":{"change":6,"start":433848,"end":433892},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2413,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41244}],"down_context":[{"change":6,"pos":433918}],"flag":"BLOCK","start":78315,"end":78337,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2416,"ins":{"up_context":[{"change":6,"pos":433926}],"down_context":[{"change":6,"pos":434046}],"flag":"BLOCK","start":78338,"end":78421,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":433926},"to":{"change":6,"start":24414,"end":24485},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24485},"to":{"change":6,"start":28908,"end":28985},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30539},"to":{"change":6,"start":28908,"end":28985},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&*txn.read(), &channel_bob.read().graph);"}],"del_contents":[{"Del":" debug_to_file(&txn, &channel_bob.borrow(), \"debug_bob5\").unwrap();\n"},{"Del":" let (alive, reachable) = check_alive(&txn, &channel_bob.borrow().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2430,"ins":{"up_context":[{"change":6,"pos":434473}],"down_context":[{"change":6,"pos":434801}],"flag":"BLOCK","start":78422,"end":78691,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":434473},"to":{"change":6,"start":41245,"end":41435},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":41435},"to":{"change":6,"start":24486,"end":24564},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":434661},"to":{"change":6,"start":24486,"end":24564},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24564},"to":{"change":6,"start":28986,"end":29067},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30671},"to":{"change":6,"start":28986,"end":29067},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &alices_resolution).unwrap();"},{"Add":" apply::apply_change_arc(&changes, &txn, &channel_charlie, &bobs_resolution).unwrap();"},{"Add":" let (alive, reachable) = check_alive(&*txn.read(), &channel_charlie.read().graph);"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn, &mut channel_charlie, &alices_resolution).unwrap();\n apply::apply_change(&changes, &mut txn, &mut channel_charlie, &bobs_resolution).unwrap();\n"},{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie\").unwrap();\n"},{"Del":" let (alive, reachable) = check_alive(&txn, &channel_charlie.borrow().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2440,"ins":{"up_context":[{"change":6,"pos":435019}],"down_context":[{"change":6,"pos":435046}],"flag":"BLOCK","start":78692,"end":78715,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":435019},"to":{"change":6,"start":435019,"end":435046},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_charlie,"}],"del_contents":[{"Del":" &mut repo_charlie,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2442,"ins":{"up_context":[{"change":6,"pos":435064}],"down_context":[{"change":6,"pos":435112}],"flag":"BLOCK","start":78716,"end":78756,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":435064},"to":{"change":6,"start":435064,"end":435112},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel_charlie,"}],"del_contents":[{"Del":" &mut txn,\n &mut channel_charlie,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2447,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41450}],"down_context":[{"change":6,"pos":435138}],"flag":"BLOCK","start":78757,"end":78779,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2450,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":435146},"to":{"change":6,"start":24565,"end":24644},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn, &channel_charlie.borrow(), \"debug_charlie1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2451,"ins":{"up_context":[{"change":6,"pos":435224}],"down_context":[{"change":6,"pos":435288}],"flag":"BLOCK","start":78780,"end":78867,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":435224},"to":{"change":6,"start":29068,"end":29149},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&*txn.read(), &channel_charlie.read().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn, &channel_charlie.borrow().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2469,"ins":{"up_context":[{"change":6,"pos":435672}],"down_context":[{"change":6,"pos":435732}],"flag":"BLOCK","start":78868,"end":78924,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":435672},"to":{"change":6,"start":435672,"end":435732},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2476,"ins":{"up_context":[{"change":6,"pos":436021}],"down_context":[{"change":6,"pos":436491}],"flag":"BLOCK","start":78925,"end":79294,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436021},"to":{"change":6,"start":35026,"end":35142},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35142},"to":{"change":6,"start":436119,"end":436405},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436119},"to":{"change":6,"start":436119,"end":436405},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436405},"to":{"change":6,"start":24645,"end":24724},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let mut txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let mut channel_alice = txn_alice.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn_alice.write().add_file(\"a/file\", 0)?;"},{"Add":" txn_alice.write().add_file(\"b/file\", 0)?;"},{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;\n txn_alice.add_file(\"a/file\")?;\n txn_alice.add_file(\"b/file\")?;\n let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2484,"ins":{"up_context":[{"change":6,"pos":436529}],"down_context":[{"change":6,"pos":436671}],"flag":"BLOCK","start":79295,"end":79438,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436529},"to":{"change":6,"start":436529,"end":436595},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436595},"to":{"change":6,"start":41451,"end":41528},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\")?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2487,"ins":{"up_context":[{"change":6,"pos":436713}],"down_context":[{"change":6,"pos":436736}],"flag":"BLOCK","start":79439,"end":79458,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436713},"to":{"change":6,"start":436713,"end":436736},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2489,"ins":{"up_context":[{"change":6,"pos":436754}],"down_context":[{"change":6,"pos":436802}],"flag":"BLOCK","start":79459,"end":79499,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436754},"to":{"change":6,"start":436754,"end":436802},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2494,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41543}],"down_context":[{"change":6,"pos":436828}],"flag":"BLOCK","start":79500,"end":79522,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2498,"ins":{"up_context":[{"change":6,"pos":436885}],"down_context":[{"change":6,"pos":436929}],"flag":"BLOCK","start":79523,"end":79578,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436885},"to":{"change":6,"start":436885,"end":436929},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn_bob.write().move_file(\"a\", \"b/a\", 0).unwrap();"}],"del_contents":[{"Del":" txn_bob.move_file(\"a\", \"b/a\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2500,"ins":{"up_context":[{"change":6,"pos":436971}],"down_context":[{"change":6,"pos":437058}],"flag":"BLOCK","start":79579,"end":79654,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":436971},"to":{"change":6,"start":436971,"end":437058},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let ab = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let ab = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2503,"ins":{"up_context":[{"change":6,"pos":437087}],"down_context":[{"change":6,"pos":437133}],"flag":"BLOCK","start":79655,"end":79712,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437087},"to":{"change":6,"start":437087,"end":437133},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"b\", \"a/b\", 0).unwrap();"}],"del_contents":[{"Del":" txn_alice.move_file(\"b\", \"a/b\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2505,"ins":{"up_context":[{"change":6,"pos":437177}],"down_context":[{"change":6,"pos":437457}],"flag":"BLOCK","start":79713,"end":79868,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437177},"to":{"change":6,"start":437177,"end":437318},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437318},"to":{"change":6,"start":41544,"end":41621},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":41621},"to":{"change":6,"start":24725,"end":24799},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437394},"to":{"change":6,"start":24725,"end":24799},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let _ba = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"},{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &ab)?;"}],"del_contents":[{"Del":" let _ba = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &ab)?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2509,"ins":{"up_context":[{"change":6,"pos":437531}],"down_context":[{"change":6,"pos":437556}],"flag":"BLOCK","start":79869,"end":79890,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437531},"to":{"change":6,"start":437531,"end":437556},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2511,"ins":{"up_context":[{"change":6,"pos":437574}],"down_context":[{"change":6,"pos":437626}],"flag":"BLOCK","start":79891,"end":79935,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437574},"to":{"change":6,"start":437574,"end":437626},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2516,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41636}],"down_context":[{"change":6,"pos":437652}],"flag":"BLOCK","start":79936,"end":79958,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2520,"ins":{"up_context":[{"change":6,"pos":437661}],"down_context":[{"change":6,"pos":437722}],"flag":"BLOCK","start":79959,"end":80028,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437661},"to":{"change":6,"start":437661,"end":437722},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let v: Vec<_> = txn_alice.write().iter_working_copy().collect();"}],"del_contents":[{"Del":" let v: Vec<_> = txn_alice.iter_working_copy().collect();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2522,"ins":{"up_context":[{"change":6,"pos":437747}],"down_context":[{"change":6,"pos":437815}],"flag":"BLOCK","start":80029,"end":80120,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":437747},"to":{"change":6,"start":29150,"end":29235},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&*txn_alice.read(), &channel_alice.read().graph);"}],"del_contents":[{"Del":" let (alive, reachable) = check_alive(&txn_alice, &channel_alice.borrow().graph);\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2537,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":438158},"to":{"change":6,"start":24800,"end":24875},"introduced_by":6}],"inode":{"change":6,"pos":357372}}},"contents":[{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2545,"ins":{"up_context":[{"change":6,"pos":438425}],"down_context":[{"change":6,"pos":438487}],"flag":"BLOCK","start":80121,"end":80179,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":438425},"to":{"change":6,"start":438425,"end":438487},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo_alice = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2550,"ins":{"up_context":[{"change":6,"pos":438662}],"down_context":[{"change":6,"pos":438822}],"flag":"BLOCK","start":80180,"end":80360,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":438662},"to":{"change":6,"start":35143,"end":35203},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35203},"to":{"change":6,"start":438713,"end":438822},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":438713},"to":{"change":6,"start":438713,"end":438822},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" let channel_alice = txn_alice.write().open_or_create_channel(\"alice\")?;"},{"Add":" txn_alice.write().add_file(\"a/b/file\", 0)?;"}],"del_contents":[{"Del":" let mut txn_alice = env_alice.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_alice = txn_alice.open_or_create_channel(\"alice\")?;\n txn_alice.add_file(\"a/b/file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2555,"ins":{"up_context":[{"change":6,"pos":438885}],"down_context":[{"change":6,"pos":439033}],"flag":"BLOCK","start":80361,"end":80529,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":438885},"to":{"change":6,"start":35204,"end":35260},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35260},"to":{"change":6,"start":438932,"end":439033},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":438932},"to":{"change":6,"start":438932,"end":439033},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel_bob = txn_bob.write().open_or_create_channel(\"bob\")?;"},{"Add":" txn_bob.write().add_file(\"a/b/file\", 0)?;"}],"del_contents":[{"Del":" let mut txn_bob = env_bob.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel_bob = txn_bob.open_or_create_channel(\"bob\")?;\n txn_bob.add_file(\"a/b/file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2559,"ins":{"up_context":[{"change":6,"pos":439034}],"down_context":[{"change":6,"pos":439264}],"flag":"BLOCK","start":80530,"end":80615,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439034},"to":{"change":6,"start":439034,"end":439178},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439178},"to":{"change":6,"start":24876,"end":24955},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let init_h = record_all(&repo_alice, &changes, &txn_alice, &channel_alice, \"\")?;"}],"del_contents":[{"Del":" let init_h = record_all(\n &mut repo_alice,\n &changes,\n &mut txn_alice,\n &mut channel_alice,\n \"\",\n )?;\n"},{"Del":" debug_to_file(&txn_alice, &channel_alice.borrow(), \"debug_init\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2562,"ins":{"up_context":[{"change":6,"pos":439283}],"down_context":[{"change":6,"pos":439419}],"flag":"BLOCK","start":80616,"end":80745,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439283},"to":{"change":6,"start":439283,"end":439343},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439343},"to":{"change":6,"start":41637,"end":41714},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"},{"Add":" apply::apply_change_arc(&changes, &txn_bob, &channel_bob, &init_h)?;"}],"del_contents":[{"Del":" let mut repo_bob = working_copy::memory::Memory::new();\n"},{"Del":" apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, &init_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2565,"ins":{"up_context":[{"change":6,"pos":439461}],"down_context":[{"change":6,"pos":439484}],"flag":"BLOCK","start":80746,"end":80765,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439461},"to":{"change":6,"start":439461,"end":439484},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" &mut repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2567,"ins":{"up_context":[{"change":6,"pos":439502}],"down_context":[{"change":6,"pos":439550}],"flag":"BLOCK","start":80766,"end":80806,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439502},"to":{"change":6,"start":439502,"end":439550},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" &mut txn_bob,\n &mut channel_bob,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2572,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41729}],"down_context":[{"change":6,"pos":439576}],"flag":"BLOCK","start":80807,"end":80829,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2579,"ins":{"up_context":[{"change":6,"pos":439713}],"down_context":[{"change":6,"pos":439761}],"flag":"BLOCK","start":80830,"end":80889,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439713},"to":{"change":6,"start":439713,"end":439761},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn_bob.write().move_file(\"a/b/file\", \"c/d/file\", 0)?;"}],"del_contents":[{"Del":" txn_bob.move_file(\"a/b/file\", \"c/d/file\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2581,"ins":{"up_context":[{"change":6,"pos":439793}],"down_context":[{"change":6,"pos":439978}],"flag":"BLOCK","start":80890,"end":81007,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439793},"to":{"change":6,"start":439793,"end":439914},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":439914},"to":{"change":6,"start":24956,"end":25031},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" txn_bob.write().remove_file(\"a\")?;"},{"Add":" let bob_h = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" txn_bob.remove_file(\"a\")?;\n let bob_h = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, \"\")?;\n"},{"Del":" debug_to_file(&txn_bob, &channel_bob.borrow(), \"debug_bob0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2585,"ins":{"up_context":[{"change":6,"pos":440000}],"down_context":[{"change":6,"pos":440079}],"flag":"BLOCK","start":81008,"end":81084,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":440000},"to":{"change":6,"start":41730,"end":41810},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" apply::apply_change_arc(&changes, &txn_alice, &channel_alice, &bob_h)?;"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn_alice, &mut channel_alice, &bob_h)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2587,"ins":{"up_context":[{"change":6,"pos":440121}],"down_context":[{"change":6,"pos":440146}],"flag":"BLOCK","start":81085,"end":81106,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":440121},"to":{"change":6,"start":440121,"end":440146},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" &mut repo_alice,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2589,"ins":{"up_context":[{"change":6,"pos":440164}],"down_context":[{"change":6,"pos":440216}],"flag":"BLOCK","start":81107,"end":81151,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":440164},"to":{"change":6,"start":440164,"end":440216},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel_alice,"}],"del_contents":[{"Del":" &mut txn_alice,\n &mut channel_alice,\n"}]}},{"Edit":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2594,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":41825}],"down_context":[{"change":6,"pos":440242}],"flag":"BLOCK","start":81152,"end":81174,"inode":{"change":6,"pos":357372}}},"contents":[{"Add":" 1,"},{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":357372},"path":"libpijul/src/tests/conflict.rs","line":2598,"ins":{"up_context":[{"change":6,"pos":440251}],"down_context":[{"change":6,"pos":440311}],"flag":"BLOCK","start":81175,"end":81242,"inode":{"change":6,"pos":357372}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":440251},"to":{"change":6,"start":440251,"end":440311},"introduced_by":6}],"inode":{"change":6,"pos":357372}},"ins_contents":[{"Add":" check_tree_inodes(&*txn_alice.read(), &*channel_alice.read());"}],"del_contents":[{"Del":" check_tree_inodes(&txn_alice, &channel_alice.borrow());\n"}]}},{"Edit":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":441501}],"down_context":[{"change":6,"pos":441501}],"flag":"BLOCK","start":81243,"end":81263,"inode":{"change":6,"pos":441393}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":12,"ins":{"up_context":[{"change":6,"pos":441690}],"down_context":[{"change":6,"pos":441746}],"flag":"BLOCK","start":81264,"end":81316,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":441690},"to":{"change":6,"start":441690,"end":441746},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":18,"ins":{"up_context":[{"change":6,"pos":441948}],"down_context":[{"change":6,"pos":441987}],"flag":"BLOCK","start":81317,"end":81361,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":441948},"to":{"change":6,"start":35261,"end":35309},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":20,"ins":{"up_context":[{"change":6,"pos":441993}],"down_context":[{"change":6,"pos":442064}],"flag":"BLOCK","start":81362,"end":81437,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":441993},"to":{"change":6,"start":441993,"end":442064},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":22,"ins":{"up_context":[{"change":6,"pos":442065}],"down_context":[{"change":6,"pos":442542}],"flag":"BLOCK","start":81438,"end":81769,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":442065},"to":{"change":6,"start":442065,"end":442197},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":442197},"to":{"change":6,"start":25214,"end":25281},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":25281},"to":{"change":6,"start":7480,"end":7542},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31506},"to":{"change":6,"start":7480,"end":7542},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7542},"to":{"change":6,"start":442291,"end":442486},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":442291},"to":{"change":6,"start":442291,"end":442486},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":442486},"to":{"change":6,"start":25282,"end":25349},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" recorded_changes.push(record_all(&repo, &changes, &txn, &channel, \"\").unwrap());"},{"Add":" repo.write_file(\"file\")"},{"Add":" .unwrap()"},{"Add":" .write_all(contents2)"},{"Add":" .unwrap();"},{"Add":" recorded_changes.push(record_all(&repo, &changes, &txn, &channel, \"\").unwrap());"}],"del_contents":[{"Del":" txn.add_file(\"file\")?;\n recorded_changes.push(record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap());\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug0\").unwrap();\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" w.write_all(contents2).unwrap();\n Ok(())\n })\n .unwrap();\n recorded_changes.push(record_all(&mut repo, &changes, &mut txn, &mut channel, \"\").unwrap());\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":37,"ins":{"up_context":[{"change":6,"pos":29656}],"down_context":[{"change":6,"pos":29718}],"flag":"BLOCK","start":81770,"end":81832,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29656},"to":{"change":6,"start":29656,"end":29718},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" for x in txn.log(&channel.1.read(), 0).unwrap() {"}],"del_contents":[{"Del":" for x in txn.log(&channel.borrow(), 0).unwrap() {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":45,"ins":{"up_context":[{"change":6,"pos":442927}],"down_context":[{"change":6,"pos":442984}],"flag":"BLOCK","start":81833,"end":81886,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":442927},"to":{"change":6,"start":442927,"end":442984},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let repo2 = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo2 = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":47,"ins":{"up_context":[{"change":6,"pos":443043}],"down_context":[{"change":6,"pos":443084}],"flag":"BLOCK","start":81887,"end":81933,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443043},"to":{"change":6,"start":35310,"end":35360},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":49,"ins":{"up_context":[{"change":6,"pos":443090}],"down_context":[{"change":6,"pos":443163}],"flag":"BLOCK","start":81934,"end":82011,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443090},"to":{"change":6,"start":443090,"end":443163},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let channel = txn2.write().open_or_create_channel(\"main2\").unwrap();"}],"del_contents":[{"Del":" let mut channel = txn2.open_or_create_channel(\"main2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":52,"ins":{"up_context":[{"change":6,"pos":443244}],"down_context":[{"change":6,"pos":443386}],"flag":"BLOCK","start":82012,"end":82110,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443244},"to":{"change":6,"start":42116,"end":42196},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":42196},"to":{"change":6,"start":25350,"end":25422},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443325},"to":{"change":6,"start":25350,"end":25422},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut *txn2.write(), &mut *channel.write(), h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, h).unwrap();\n"},{"Del":" debug_to_file(&txn2, &channel.borrow(), \"debug2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":54,"ins":{"up_context":[{"change":6,"pos":443436}],"down_context":[{"change":6,"pos":443589}],"flag":"BLOCK","start":82111,"end":82184,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443436},"to":{"change":6,"start":443436,"end":443464},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443464},"to":{"change":6,"start":443464,"end":443490},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443490},"to":{"change":6,"start":443490,"end":443547},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443547},"to":{"change":6,"start":443547,"end":443589},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":443589},"to":{"change":6,"start":42197,"end":42219},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" &repo2, &changes, &txn2, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" &mut repo2,\n"},{"Del":" &changes,\n"},{"Del":" &mut txn2,\n &mut channel,\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":80,"ins":{"up_context":[{"change":6,"pos":444336}],"down_context":[{"change":6,"pos":444375}],"flag":"BLOCK","start":82185,"end":82229,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444336},"to":{"change":6,"start":35361,"end":35409},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":82,"ins":{"up_context":[{"change":6,"pos":444389}],"down_context":[{"change":6,"pos":444631}],"flag":"BLOCK","start":82230,"end":82497,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444389},"to":{"change":6,"start":444389,"end":444631},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" txn.write().add_file(\"a/b/c/d\", 0)?;"},{"Add":" txn.write().add_file(\"e/f/g/h\", 0)?;"},{"Add":" txn.write().add_file(\"i/j/k/l\", 0)?;"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\")?"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n txn.add_file(\"a/b/c/d\")?;\n txn.add_file(\"e/f/g/h\")?;\n txn.add_file(\"i/j/k/l\")?;\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"\")?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":89,"ins":{"up_context":[{"change":6,"pos":444653}],"down_context":[{"change":6,"pos":445022}],"flag":"BLOCK","start":82498,"end":82777,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444653},"to":{"change":6,"start":444653,"end":444724},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444724},"to":{"change":6,"start":7543,"end":7608},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7608},"to":{"change":6,"start":444765,"end":444835},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444765},"to":{"change":6,"start":444765,"end":444835},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444835},"to":{"change":6,"start":7609,"end":7674},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7674},"to":{"change":6,"start":444876,"end":445022},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":444876},"to":{"change":6,"start":444876,"end":445022},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" repo.write_file(\"a/b/c/d\").unwrap().write_all(b\"edits\\n\")?;"},{"Add":" repo.write_file(\"e/f/g/h\").unwrap().write_all(b\"edits\\n\")?;"},{"Add":" record_all(&mut repo, &changes, &txn, &channel, \"a/b/c/d\")?"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(\"main\").unwrap();\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"a/b/c/d\", |w| {\n"},{"Del":" w.write_all(b\"edits\\n\")?;\n Ok(())\n })?;\n"},{"Del":" repo.write_file::<_, std::io::Error, _>(\"e/f/g/h\", |w| {\n"},{"Del":" w.write_all(b\"edits\\n\")?;\n Ok(())\n })?;\n record_all(&mut repo, &changes, &mut txn, &mut channel, \"a/b/c/d\")?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":99,"ins":{"up_context":[{"change":6,"pos":445096}],"down_context":[{"change":6,"pos":445153}],"flag":"BLOCK","start":82778,"end":82831,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445096},"to":{"change":6,"start":445096,"end":445153},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let repo2 = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo2 = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":101,"ins":{"up_context":[{"change":6,"pos":445212}],"down_context":[{"change":6,"pos":445253}],"flag":"BLOCK","start":82832,"end":82878,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445212},"to":{"change":6,"start":35410,"end":35460},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":103,"ins":{"up_context":[{"change":6,"pos":445259}],"down_context":[{"change":6,"pos":445408}],"flag":"BLOCK","start":82879,"end":83051,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445259},"to":{"change":6,"start":445259,"end":445332},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445332},"to":{"change":6,"start":42220,"end":42297},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" let channel = txn2.write().open_or_create_channel(\"main2\").unwrap();"},{"Add":" apply::apply_change(&changes, &mut *txn2.write(), &mut *channel.write(), &h).unwrap();"}],"del_contents":[{"Del":" let mut channel = txn2.open_or_create_channel(\"main2\").unwrap();\n"},{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, &h).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":106,"ins":{"up_context":[{"change":6,"pos":445454}],"down_context":[{"change":6,"pos":445586}],"flag":"BLOCK","start":83052,"end":83124,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445454},"to":{"change":6,"start":445454,"end":445478},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445478},"to":{"change":6,"start":445478,"end":445500},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445500},"to":{"change":6,"start":445500,"end":445549},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445549},"to":{"change":6,"start":445549,"end":445586},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445586},"to":{"change":6,"start":42298,"end":42316},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" &repo2, &changes, &txn2, &channel, \"e/f\", true, None, 1, 0,"}],"del_contents":[{"Del":" &mut repo2,\n"},{"Del":" &changes,\n"},{"Del":" &mut txn2,\n &mut channel,\n"},{"Del":" \"e/f\",\n true,\n"},{"Del":" None,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":116,"ins":{"up_context":[{"change":6,"pos":445808}],"down_context":[{"change":6,"pos":445885}],"flag":"BLOCK","start":83125,"end":83221,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445808},"to":{"change":6,"start":42317,"end":42395},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" apply::apply_change(&changes, &mut *txn2.write(), &mut *channel.write(), &h2).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&changes, &mut txn2, &mut channel, &h2).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":441393},"path":"libpijul/src/tests/clone.rs","line":118,"ins":{"up_context":[{"change":6,"pos":445931}],"down_context":[{"change":6,"pos":446060}],"flag":"BLOCK","start":83222,"end":83291,"inode":{"change":6,"pos":441393}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445931},"to":{"change":6,"start":445931,"end":445955},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445955},"to":{"change":6,"start":445955,"end":445977},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":445977},"to":{"change":6,"start":445977,"end":446026},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":446026},"to":{"change":6,"start":446026,"end":446060},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":446060},"to":{"change":6,"start":42396,"end":42414},"introduced_by":6}],"inode":{"change":6,"pos":441393}},"ins_contents":[{"Add":" &repo2, &changes, &txn2, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" &mut repo2,\n"},{"Del":" &changes,\n"},{"Del":" &mut txn2,\n &mut channel,\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"}]}},{"Edit":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":446583}],"down_context":[{"change":6,"pos":446583}],"flag":"BLOCK","start":83292,"end":83312,"inode":{"change":6,"pos":446445}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Edit":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":446584}],"down_context":[{"change":6,"pos":446584}],"flag":"BLOCK","start":83313,"end":83328,"inode":{"change":6,"pos":446445}}},"contents":[{"Add":"use super::*;"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":35,"ins":{"up_context":[{"change":6,"pos":447504}],"down_context":[{"change":6,"pos":447560}],"flag":"BLOCK","start":83329,"end":83381,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":447504},"to":{"change":6,"start":447504,"end":447560},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":41,"ins":{"up_context":[{"change":6,"pos":447764}],"down_context":[{"change":6,"pos":447917}],"flag":"BLOCK","start":83382,"end":83570,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":447764},"to":{"change":6,"start":35512,"end":35560},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35560},"to":{"change":6,"start":447803,"end":447917},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":447803},"to":{"change":6,"start":447803,"end":447917},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let mut channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" txn.write().add_file(\"file2\", 0)?;"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel = txn.open_or_create_channel(\"main\")?;\n txn.add_file(\"file\")?;\n txn.add_file(\"file2\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":49,"ins":{"up_context":[{"change":6,"pos":447981}],"down_context":[{"change":6,"pos":448003}],"flag":"BLOCK","start":83571,"end":83596,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":447981},"to":{"change":6,"start":447981,"end":448003},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" txn.clone(),"}],"del_contents":[{"Del":" &mut txn,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":51,"ins":{"up_context":[{"change":6,"pos":448033}],"down_context":[{"change":6,"pos":448082}],"flag":"BLOCK","start":83597,"end":83645,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448033},"to":{"change":6,"start":29765,"end":29804},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29804},"to":{"change":6,"start":448059,"end":448082},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448059},"to":{"change":6,"start":448059,"end":448082},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" channel.clone(),"},{"Add":" &repo,"}],"del_contents":[{"Del":" &mut channel.borrow_mut(),\n"},{"Del":" &mut repo,\n"}]}},{"Edit":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":55,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":448118}],"down_context":[{"change":6,"pos":448118}],"flag":"BLOCK","start":83646,"end":83661,"inode":{"change":6,"pos":446445}}},"contents":[{"Add":" 0,"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":62,"ins":{"up_context":[{"change":6,"pos":448245}],"down_context":[{"change":6,"pos":448285}],"flag":"BLOCK","start":83662,"end":83719,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448245},"to":{"change":6,"start":29805,"end":29854},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn.read()).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&txn).unwrap())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":66,"ins":{"up_context":[{"change":6,"pos":448397}],"down_context":[{"change":6,"pos":448411}],"flag":"BLOCK","start":83720,"end":83742,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448397},"to":{"change":6,"start":448397,"end":448411},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" &*txn.read(),"}],"del_contents":[{"Del":" &txn,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":69,"ins":{"up_context":[{"change":6,"pos":448446}],"down_context":[{"change":6,"pos":448468}],"flag":"BLOCK","start":83743,"end":83794,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448446},"to":{"change":6,"start":448446,"end":448468},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" std::mem::take(&mut *rec.contents.lock()),"}],"del_contents":[{"Del":" rec.contents,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":80,"ins":{"up_context":[{"change":6,"pos":448734}],"down_context":[{"change":6,"pos":448824}],"flag":"BLOCK","start":83795,"end":83942,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448734},"to":{"change":6,"start":42415,"end":42506},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" apply::apply_local_change("},{"Add":" &mut *txn.write(),"},{"Add":" &mut channel,"},{"Add":" &change0,"},{"Add":" &hash0,"},{"Add":" &rec.updatables,"},{"Add":" )?;"}],"del_contents":[{"Del":" apply::apply_local_change(&mut txn, &mut channel, &change0, &hash0, &rec.updatables)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":89,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448855},"to":{"change":6,"start":448855,"end":448856},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448856},"to":{"change":6,"start":25423,"end":25477},"introduced_by":6}],"inode":{"change":6,"pos":446445}}},"contents":[{"Del":"\n"},{"Del":" debug_to_file(&txn, &channel.borrow(), \"debug\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":91,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448911},"to":{"change":6,"start":448911,"end":448914},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448914},"to":{"change":6,"start":1940,"end":1999},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1999},"to":{"change":6,"start":448979,"end":449080},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":448979},"to":{"change":6,"start":448979,"end":449080},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449080},"to":{"change":6,"start":7734,"end":7822},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7822},"to":{"change":6,"start":449125,"end":449161},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449125},"to":{"change":6,"start":449125,"end":449161},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449161},"to":{"change":6,"start":29877,"end":30026},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30026},"to":{"change":6,"start":449237,"end":449238},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449237},"to":{"change":6,"start":449237,"end":449238},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449238},"to":{"change":6,"start":449238,"end":449328},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449328},"to":{"change":6,"start":30027,"end":30075},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30075},"to":{"change":6,"start":449367,"end":449926},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449367},"to":{"change":6,"start":449367,"end":449926},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449926},"to":{"change":6,"start":30076,"end":30097},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30097},"to":{"change":6,"start":449933,"end":449978},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449933},"to":{"change":6,"start":449933,"end":449978},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":449978},"to":{"change":6,"start":42507,"end":42587},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":42587},"to":{"change":6,"start":450057,"end":450081},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":450057},"to":{"change":6,"start":450057,"end":450081},"introduced_by":6}],"inode":{"change":6,"pos":446445}}},"contents":[{"Del":"}\n\n"},{"Del":"fn record_all(\n"},{"Del":" repo: &mut R,\n store: &P,\n txn: &mut T,\n channel: &mut ChannelRef,\n prefix: &str,\n"},{"Del":") -> Result<(Hash, Change), anyhow::Error>\nwhere\n R::Error: Send + Sync + 'static,\n{\n"},{"Del":" let mut state = Builder::new();\n"},{"Del":" state.record(\n txn,\n Algorithm::default(),\n &mut channel.borrow_mut(),\n repo,\n store,\n prefix,\n )?;\n"},{"Del":"\n"},{"Del":" let rec = state.finish();\n let changes = rec\n .actions\n .into_iter()\n"},{"Del":" .map(|rec| rec.globalize(txn).unwrap())\n"},{"Del":" .collect();\n let change0 = crate::change::Change::make_change(\n txn,\n &channel,\n changes,\n rec.contents,\n crate::change::ChangeHeader {\n message: \"test\".to_string(),\n authors: vec![],\n description: None,\n // Beware of changing the following line: two changes\n // doing the same thing will be equal. Sometimes we don't\n // want that, as in tests::unrecord::unrecord_double.\n timestamp: chrono::Utc::now(),\n },\n Vec::new(),\n"},{"Del":" )\n .unwrap();\n"},{"Del":" let hash = store.save_change(&change0)?;\n"},{"Del":" apply::apply_local_change(txn, channel, &change0, &hash, &rec.updatables)?;\n"},{"Del":" Ok((hash, change0))\n"}]}},{"Edit":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":95,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":450125}],"down_context":[{"change":6,"pos":450125}],"flag":"BLOCK","start":83943,"end":83953,"inode":{"change":6,"pos":446445}}},"contents":[{"Add":"#[ignore]"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":100,"ins":{"up_context":[{"change":6,"pos":450251}],"down_context":[{"change":6,"pos":450307}],"flag":"BLOCK","start":83954,"end":84006,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":450251},"to":{"change":6,"start":450251,"end":450307},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let mut repo = working_copy::memory::Memory::new();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":106,"ins":{"up_context":[{"change":6,"pos":450511}],"down_context":[{"change":6,"pos":450748}],"flag":"BLOCK","start":84007,"end":84302,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":450511},"to":{"change":6,"start":35561,"end":35609},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35609},"to":{"change":6,"start":450550,"end":450748},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":450550},"to":{"change":6,"start":450550,"end":450748},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" txn.write().add_file(\"file2\", 0)?;"},{"Add":" let h0 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change0 = store.get_change(&h0).unwrap();"}],"del_contents":[{"Del":" let mut txn = env.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel = txn.open_or_create_channel(\"main\")?;\n txn.add_file(\"file\")?;\n txn.add_file(\"file2\")?;\n let (h0, change0) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":114,"ins":{"up_context":[{"change":6,"pos":450786}],"down_context":[{"change":6,"pos":450970}],"flag":"BLOCK","start":84303,"end":84476,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":450786},"to":{"change":6,"start":7823,"end":7881},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":7881},"to":{"change":6,"start":450820,"end":450970},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":450820},"to":{"change":6,"start":450820,"end":450970},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" write!(repo.write_file(\"file\")?, \"a\\nx\\nc\\ne\\ny\\nf\\n\")?;"},{"Add":""},{"Add":" let h1 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change1 = store.get_change(&h1).unwrap();"}],"del_contents":[{"Del":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {\n"},{"Del":" write!(w, \"a\\nx\\nc\\ne\\ny\\nf\\n\")?;\n Ok(())\n })?;\n let (h1, change1) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":121,"ins":{"up_context":[{"change":6,"pos":451040}],"down_context":[{"change":6,"pos":451124}],"flag":"BLOCK","start":84477,"end":84588,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":451040},"to":{"change":6,"start":451040,"end":451124},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" let h2 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change2 = store.get_change(&h2).unwrap();"}],"del_contents":[{"Del":" let (h2, change2) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":126,"ins":{"up_context":[{"change":6,"pos":451197}],"down_context":[{"change":6,"pos":451318}],"flag":"BLOCK","start":84589,"end":84748,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":451197},"to":{"change":6,"start":451197,"end":451318},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" txn.write().move_file(\"file\", \"file3\", 0)?;"},{"Add":" let h3 = record_all(&repo, &store, &txn, &channel, \"\")?;"},{"Add":" let change3 = store.get_change(&h3).unwrap();"}],"del_contents":[{"Del":" txn.move_file(\"file\", \"file3\")?;\n let (h3, change3) = record_all(&mut repo, &store, &mut txn, &mut channel, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":133,"ins":{"up_context":[{"change":6,"pos":451437}],"down_context":[{"change":6,"pos":451888}],"flag":"BLOCK","start":84749,"end":85261,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":451437},"to":{"change":6,"start":35610,"end":35660},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":35660},"to":{"change":6,"start":451478,"end":451597},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":451478},"to":{"change":6,"start":451478,"end":451597},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":451597},"to":{"change":6,"start":42588,"end":42783},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42783},"to":{"change":6,"start":5048,"end":5090},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5090},"to":{"change":6,"start":5090,"end":5110},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5110},"to":{"change":6,"start":5110,"end":5126},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5126},"to":{"change":6,"start":5126,"end":5168},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5168},"to":{"change":6,"start":5168,"end":5208},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5208},"to":{"change":6,"start":5208,"end":5216},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" let txn2 = env2.arc_txn_begin().unwrap();"},{"Add":" let channel2 = txn2.write().open_or_create_channel(\"main\")?;"},{"Add":" let repo2 = working_copy::memory::Memory::new();"},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h0)?;"},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h1)?;"},{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h2)?;"},{"Add":" output::output_repository_no_pending(&repo2, &store, &txn2, &channel2, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" let mut txn2 = env2.mut_txn_begin().unwrap();\n"},{"Del":" let mut channel2 = txn2.open_or_create_channel(\"main\")?;\n let mut repo2 = working_copy::memory::Memory::new();\n\n"},{"Del":" apply::apply_change(&store, &mut txn2, &mut channel2, &h0)?;\n apply::apply_change(&store, &mut txn2, &mut channel2, &h1)?;\n apply::apply_change(&store, &mut txn2, &mut channel2, &h2)?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" &mut repo2,\n"},{"Del":" &store,\n"},{"Del":" &mut txn2,\n &mut channel2,\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":141,"ins":{"up_context":[{"change":6,"pos":451924}],"down_context":[{"change":6,"pos":452042}],"flag":"BLOCK","start":85262,"end":85366,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":451924},"to":{"change":6,"start":451924,"end":452042},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" txn2.write().move_file(\"file\", \"file4\", 0)?;"},{"Add":" record_all(&repo2, &store, &txn2, &channel2, \"\")?;"}],"del_contents":[{"Del":" txn2.move_file(\"file\", \"file4\")?;\n let (_, _) = record_all(&mut repo2, &store, &mut txn2, &mut channel2, \"\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":446445},"path":"libpijul/src/tests/change.rs","line":144,"ins":{"up_context":[{"change":6,"pos":452043}],"down_context":[{"change":6,"pos":452294}],"flag":"BLOCK","start":85367,"end":85662,"inode":{"change":6,"pos":446445}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":452043},"to":{"change":6,"start":42889,"end":42954},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42954},"to":{"change":6,"start":5217,"end":5259},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5259},"to":{"change":6,"start":5259,"end":5279},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5279},"to":{"change":6,"start":5279,"end":5295},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5295},"to":{"change":6,"start":5295,"end":5337},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5337},"to":{"change":6,"start":5337,"end":5377},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5377},"to":{"change":6,"start":5377,"end":5385},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":5385},"to":{"change":6,"start":452206,"end":452294},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":43059},"to":{"change":6,"start":452206,"end":452294},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":452206},"to":{"change":6,"start":452206,"end":452294},"introduced_by":6}],"inode":{"change":6,"pos":446445}},"ins_contents":[{"Add":" apply::apply_change(&store, &mut *txn2.write(), &mut *channel2.write(), &h3)?;"},{"Add":" output::output_repository_no_pending(&repo2, &store, &txn2, &channel2, \"\", true, None, 1, 0)?;"},{"Add":" let h = record_all(&repo2, &store, &txn2, &channel2, \"\")?;"},{"Add":" let solution = store.get_change(&h).unwrap();"}],"del_contents":[{"Del":" apply::apply_change(&store, &mut txn2, &mut channel2, &h3)?;\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" &mut repo2,\n"},{"Del":" &store,\n"},{"Del":" &mut txn2,\n &mut channel2,\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" )?;\n"},{"Del":" let (h, solution) = record_all(&mut repo2, &store, &mut txn2, &mut channel2, \"\")?;\n\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":9,"ins":{"up_context":[{"change":6,"pos":454275}],"down_context":[{"change":6,"pos":454331}],"flag":"BLOCK","start":85663,"end":85715,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":454275},"to":{"change":6,"start":23005,"end":23067},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":16,"ins":{"up_context":[{"change":6,"pos":454514}],"down_context":[{"change":6,"pos":454600}],"flag":"BLOCK","start":85716,"end":85818,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":454514},"to":{"change":6,"start":23068,"end":23139},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":23139},"to":{"change":6,"start":1227,"end":1290},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0).unwrap();"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"dir/file\", 0).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":19,"ins":{"up_context":[{"change":6,"pos":454601}],"down_context":[{"change":6,"pos":454750}],"flag":"BLOCK","start":85819,"end":85960,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":454601},"to":{"change":6,"start":23200,"end":23363},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" let channel = txn.write().unwrap().open_or_create_channel(\"main\").unwrap();\n record_all(repo, &changes, txn.clone(), channel.clone(), \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":23,"ins":{"up_context":[{"change":6,"pos":454793}],"down_context":[{"change":6,"pos":454931}],"flag":"BLOCK","start":85961,"end":86054,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":454793},"to":{"change":6,"start":1291,"end":1363},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1363},"to":{"change":6,"start":23433,"end":23536},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":23433},"to":{"change":6,"start":23433,"end":23536},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" assert!(txn.write().add_file(\"dir/file\", 0).is_err());"},{"Add":" txn.commit().unwrap()"}],"del_contents":[{"Del":" assert!(txn.write().unwrap().add_file(\"dir/file\", 0).is_err());\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n commit(txn).unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":34,"ins":{"up_context":[{"change":6,"pos":30201}],"down_context":[{"change":6,"pos":30202}],"flag":"BLOCK","start":86055,"end":86094,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30201},"to":{"change":6,"start":23537,"end":23585},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = channel_.read();"}],"del_contents":[{"Del":" let channel = channel_.read().unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":52,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30657},"to":{"change":6,"start":35990,"end":36049},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&txn, &channel_, \"debug2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":100,"ins":{"up_context":[{"change":6,"pos":457332}],"down_context":[{"change":6,"pos":23701}],"flag":"BLOCK","start":86095,"end":86147,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":457332},"to":{"change":6,"start":23639,"end":23701},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":105,"ins":{"up_context":[{"change":6,"pos":457507}],"down_context":[{"change":6,"pos":457648}],"flag":"BLOCK","start":86148,"end":86325,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":457507},"to":{"change":6,"start":23756,"end":23827},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":23827},"to":{"change":6,"start":1398,"end":1461},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1461},"to":{"change":6,"start":23828,"end":23912},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36365},"to":{"change":6,"start":23828,"end":23912},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0).unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\").unwrap();"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"dir/file\", 0).unwrap();\n"},{"Del":" let channel = txn.write().unwrap().open_or_create_channel(\"main\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":110,"ins":{"up_context":[{"change":6,"pos":457716}],"down_context":[{"change":6,"pos":31171}],"flag":"BLOCK","start":86326,"end":86490,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":457716},"to":{"change":6,"start":36454,"end":36561},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36561},"to":{"change":6,"start":23913,"end":23942},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":23942},"to":{"change":6,"start":36591,"end":36804},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36591},"to":{"change":6,"start":36591,"end":36804},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\").unwrap();"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n"},{"Del":" channel.clone(),\n"},{"Del":" \"\",\n )\n .unwrap();\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\").unwrap();\n let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":117,"ins":{"up_context":[{"change":6,"pos":43983}],"down_context":[{"change":6,"pos":458109}],"flag":"BLOCK","start":86491,"end":86540,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":43983},"to":{"change":6,"start":36805,"end":36863},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn.write().remove_file(\"dir\").unwrap();"}],"del_contents":[{"Del":" txn.write().unwrap().remove_file(\"dir\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":119,"ins":{"up_context":[{"change":6,"pos":458110}],"down_context":[{"change":6,"pos":31207}],"flag":"BLOCK","start":86541,"end":86625,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":458110},"to":{"change":6,"start":36864,"end":36957},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":125,"ins":{"up_context":[{"change":6,"pos":458320}],"down_context":[{"change":6,"pos":458452}],"flag":"BLOCK","start":86626,"end":86698,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":458320},"to":{"change":6,"start":23943,"end":24028},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24028},"to":{"change":6,"start":37028,"end":37102},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37028},"to":{"change":6,"start":37028,"end":37102},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" record_all_output(repo, changes, txn.clone(), channel.clone(), \"\").unwrap();\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":127,"ins":{"up_context":[{"change":6,"pos":458453}],"down_context":[{"change":6,"pos":31243}],"flag":"BLOCK","start":86699,"end":86783,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":458453},"to":{"change":6,"start":37103,"end":37196},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":134,"ins":{"up_context":[{"change":6,"pos":458708}],"down_context":[{"change":6,"pos":37317}],"flag":"BLOCK","start":86784,"end":86889,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":458708},"to":{"change":6,"start":1462,"end":1526},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1526},"to":{"change":6,"start":37258,"end":37317},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37258},"to":{"change":6,"start":37258,"end":37317},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn.write().add_file(\"dir2/file\", 0).unwrap();"},{"Add":" txn.write().remove_file(\"dir2\").unwrap();"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"dir2/file\", 0).unwrap();\n"},{"Del":" txn.write().unwrap().remove_file(\"dir2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":137,"ins":{"up_context":[{"change":6,"pos":37334}],"down_context":[{"change":6,"pos":37460}],"flag":"BLOCK","start":86890,"end":86990,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37334},"to":{"change":6,"start":37334,"end":37460},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT).all(|f| f.unwrap().1 != \"dir2\")"}],"del_contents":[{"Del":" crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n .all(|f| f.unwrap().1 != \"dir2\")\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":139,"ins":{"up_context":[{"change":6,"pos":37471}],"down_context":[{"change":6,"pos":458950}],"flag":"BLOCK","start":86991,"end":87080,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37471},"to":{"change":6,"start":37471,"end":37539},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37539},"to":{"change":6,"start":24029,"end":24058},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" assert!(txn.write().remove_file(\"dir2\").is_err());"},{"Add":" txn.commit().unwrap()"}],"del_contents":[{"Del":" assert!(txn.write().unwrap().remove_file(\"dir2\").is_err());\n"},{"Del":" commit(txn).unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":158,"ins":{"up_context":[{"change":6,"pos":3034}],"down_context":[{"change":6,"pos":24121}],"flag":"BLOCK","start":87081,"end":87133,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3034},"to":{"change":6,"start":24059,"end":24121},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":162,"ins":{"up_context":[{"change":6,"pos":3203}],"down_context":[{"change":6,"pos":3333}],"flag":"BLOCK","start":87134,"end":87284,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3203},"to":{"change":6,"start":24176,"end":24243},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":24243},"to":{"change":6,"start":1527,"end":1579},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1579},"to":{"change":6,"start":24244,"end":24316},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37839},"to":{"change":6,"start":24244,"end":24316},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"a/b/c/d/e\", 0)?;"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"a/b/c/d/e\", 0)?;\n"},{"Del":" let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":167,"ins":{"up_context":[{"change":6,"pos":3398}],"down_context":[{"change":6,"pos":31414}],"flag":"BLOCK","start":87285,"end":87433,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3398},"to":{"change":6,"start":24317,"end":24453},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24453},"to":{"change":6,"start":37998,"end":38158},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37998},"to":{"change":6,"start":37998,"end":38158},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\").unwrap();\n let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":175,"ins":{"up_context":[{"change":6,"pos":3793}],"down_context":[{"change":6,"pos":3919}],"flag":"BLOCK","start":87434,"end":87502,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3793},"to":{"change":6,"start":24454,"end":24590},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24590},"to":{"change":6,"start":38241,"end":38311},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":38241},"to":{"change":6,"start":38241,"end":38311},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":177,"ins":{"up_context":[{"change":6,"pos":3920}],"down_context":[{"change":6,"pos":24697}],"flag":"BLOCK","start":87503,"end":87655,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3920},"to":{"change":6,"start":24591,"end":24654},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24654},"to":{"change":6,"start":5386,"end":5428},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":38379},"to":{"change":6,"start":5386,"end":5428},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3977},"to":{"change":6,"start":5386,"end":5428},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5428},"to":{"change":6,"start":24655,"end":24678},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":24678},"to":{"change":6,"start":24678,"end":24696},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":24696},"to":{"change":6,"start":38412,"end":38458},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":38412},"to":{"change":6,"start":38412,"end":38458},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":38458},"to":{"change":6,"start":5506,"end":5546},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5506},"to":{"change":6,"start":5506,"end":5546},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5546},"to":{"change":6,"start":38459,"end":38470},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":38470},"to":{"change":6,"start":1580,"end":1591},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1591},"to":{"change":6,"start":5546,"end":5554},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":38470},"to":{"change":6,"start":5546,"end":5554},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5546},"to":{"change":6,"start":5546,"end":5554},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo2 = working_copy::memory::Memory::new();"},{"Add":" output::output_repository_no_pending(&repo2, &changes, &txn, &channel, \"\", true, None, 1, 0)?;"}],"del_contents":[{"Del":" let repo2 = Arc::new(working_copy::memory::Memory::new());\n"},{"Del":" output::output_repository_no_pending(\n"},{"Del":" repo2.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":182,"ins":{"up_context":[{"change":6,"pos":4131}],"down_context":[{"change":6,"pos":31446}],"flag":"BLOCK","start":87656,"end":87736,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4131},"to":{"change":6,"start":38471,"end":38560},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":195,"ins":{"up_context":[{"change":6,"pos":459375}],"down_context":[{"change":6,"pos":24787}],"flag":"BLOCK","start":87737,"end":87789,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":459375},"to":{"change":6,"start":24725,"end":24787},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":199,"ins":{"up_context":[{"change":6,"pos":459544}],"down_context":[{"change":6,"pos":459673}],"flag":"BLOCK","start":87790,"end":87939,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":459544},"to":{"change":6,"start":24842,"end":24909},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":24909},"to":{"change":6,"start":1592,"end":1643},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1643},"to":{"change":6,"start":24910,"end":24982},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":38811},"to":{"change":6,"start":24910,"end":24982},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0)?;"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"dir/file\", 0)?;\n"},{"Del":" let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":204,"ins":{"up_context":[{"change":6,"pos":459737}],"down_context":[{"change":6,"pos":459869}],"flag":"BLOCK","start":87940,"end":88016,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":459737},"to":{"change":6,"start":24983,"end":25132},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":25132},"to":{"change":6,"start":38978,"end":39048},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":38978},"to":{"change":6,"start":38978,"end":39048},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )\n .unwrap();\n"},{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":210,"ins":{"up_context":[{"change":6,"pos":39151}],"down_context":[{"change":6,"pos":460049}],"flag":"BLOCK","start":88017,"end":88093,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":39151},"to":{"change":6,"start":25133,"end":25282},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":214,"ins":{"up_context":[{"change":6,"pos":460193}],"down_context":[{"change":6,"pos":460263}],"flag":"BLOCK","start":88094,"end":88121,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":460193},"to":{"change":6,"start":25283,"end":25379},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn.commit().unwrap();"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n commit(txn).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":223,"ins":{"up_context":[{"change":6,"pos":460422}],"down_context":[{"change":6,"pos":460478}],"flag":"BLOCK","start":88122,"end":88174,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":460422},"to":{"change":6,"start":25380,"end":25442},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":227,"ins":{"up_context":[{"change":6,"pos":460591}],"down_context":[{"change":6,"pos":460720}],"flag":"BLOCK","start":88175,"end":88324,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":460591},"to":{"change":6,"start":25443,"end":25510},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25510},"to":{"change":6,"start":1644,"end":1695},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1695},"to":{"change":6,"start":25511,"end":25583},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":39375},"to":{"change":6,"start":25511,"end":25583},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0)?;"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"dir/file\", 0)?;\n"},{"Del":" let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":232,"ins":{"up_context":[{"change":6,"pos":460784}],"down_context":[{"change":6,"pos":460857}],"flag":"BLOCK","start":88325,"end":88393,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":460784},"to":{"change":6,"start":25584,"end":25720},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":235,"ins":{"up_context":[{"change":6,"pos":25786}],"down_context":[{"change":6,"pos":25922}],"flag":"BLOCK","start":88394,"end":88462,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25786},"to":{"change":6,"start":25786,"end":25922},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":237,"ins":{"up_context":[{"change":6,"pos":25984}],"down_context":[{"change":6,"pos":26262}],"flag":"BLOCK","start":88463,"end":88531,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":25984},"to":{"change":6,"start":25984,"end":26262},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug0\").unwrap();\n record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":239,"ins":{"up_context":[{"change":6,"pos":26321}],"down_context":[{"change":6,"pos":461484}],"flag":"BLOCK","start":88532,"end":88600,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26321},"to":{"change":6,"start":26321,"end":26457},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":243,"ins":{"up_context":[{"change":6,"pos":461628}],"down_context":[{"change":6,"pos":461699}],"flag":"BLOCK","start":88601,"end":88628,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":461628},"to":{"change":6,"start":26458,"end":26555},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn.commit().unwrap();"}],"del_contents":[{"Del":" debug_to_file(&*txn.read().unwrap(), &channel, \"debug2\").unwrap();\n commit(txn).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":252,"ins":{"up_context":[{"change":6,"pos":461856}],"down_context":[{"change":6,"pos":461918}],"flag":"BLOCK","start":88629,"end":88687,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":461856},"to":{"change":6,"start":26556,"end":26624},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_alice = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":258,"ins":{"up_context":[{"change":6,"pos":462103}],"down_context":[{"change":6,"pos":462187}],"flag":"BLOCK","start":88688,"end":88788,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462103},"to":{"change":6,"start":26625,"end":26704},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26704},"to":{"change":6,"start":1696,"end":1749},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" txn_alice.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));\n"},{"Del":" txn_alice.write().unwrap().add_file(\"file\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":261,"ins":{"up_context":[{"change":6,"pos":462188}],"down_context":[{"change":6,"pos":462402}],"flag":"BLOCK","start":88789,"end":88937,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462188},"to":{"change":6,"start":26755,"end":26841},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26841},"to":{"change":6,"start":26841,"end":26870},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26870},"to":{"change":6,"start":26870,"end":26898},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26898},"to":{"change":6,"start":26898,"end":26988},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":26988},"to":{"change":6,"start":26988,"end":27065},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = txn_alice.write().open_or_create_channel(\"main\")?;"},{"Add":" let alice0 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel(\"main\")?;\n"},{"Del":" let alice0 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":265,"ins":{"up_context":[{"change":6,"pos":462451}],"down_context":[{"change":6,"pos":462600}],"flag":"BLOCK","start":88938,"end":89017,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462451},"to":{"change":6,"start":27066,"end":27095},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27095},"to":{"change":6,"start":27095,"end":27123},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27123},"to":{"change":6,"start":27123,"end":27213},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27213},"to":{"change":6,"start":27213,"end":27290},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let alice1 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let alice1 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":267,"ins":{"up_context":[{"change":6,"pos":462601}],"down_context":[{"change":6,"pos":462661}],"flag":"BLOCK","start":89018,"end":89074,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462601},"to":{"change":6,"start":27291,"end":27357},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_bob = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":269,"ins":{"up_context":[{"change":6,"pos":462723}],"down_context":[{"change":6,"pos":27517}],"flag":"BLOCK","start":89075,"end":89202,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462723},"to":{"change":6,"start":27358,"end":27517},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel = (&mut *txn_bob.write()).open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn_bob = Arc::new(RwLock::new(env_bob.mut_txn_begin().unwrap()));\n let channel = (&mut *txn_bob.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":273,"ins":{"up_context":[{"change":6,"pos":27560}],"down_context":[{"change":6,"pos":27640}],"flag":"BLOCK","start":89203,"end":89265,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27560},"to":{"change":6,"start":27560,"end":27640},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &mut *txn_bob.write(),"},{"Add":" &mut *channel.write(),"}],"del_contents":[{"Del":" &mut *txn_bob.write().unwrap(),\n &mut *channel.write().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":278,"ins":{"up_context":[{"change":6,"pos":462947}],"down_context":[{"change":6,"pos":463058}],"flag":"BLOCK","start":89266,"end":89337,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462947},"to":{"change":6,"start":27666,"end":27692},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":27692},"to":{"change":6,"start":462970,"end":462988},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462970},"to":{"change":6,"start":462970,"end":462988},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":462988},"to":{"change":6,"start":27693,"end":27743},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":27743},"to":{"change":6,"start":463032,"end":463058},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463032},"to":{"change":6,"start":463032,"end":463058},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463058},"to":{"change":6,"start":44455,"end":44469},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44469},"to":{"change":6,"start":27744,"end":27755},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27755},"to":{"change":6,"start":1750,"end":1761},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":280,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463066},"to":{"change":6,"start":27756,"end":27835},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel, \"debug_bob1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":285,"ins":{"up_context":[{"change":6,"pos":27879}],"down_context":[{"change":6,"pos":27959}],"flag":"BLOCK","start":89338,"end":89400,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":27879},"to":{"change":6,"start":27879,"end":27959},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &mut *txn_bob.write(),"},{"Add":" &mut *channel.write(),"}],"del_contents":[{"Del":" &mut *txn_bob.write().unwrap(),\n &mut *channel.write().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":290,"ins":{"up_context":[{"change":6,"pos":463328}],"down_context":[{"change":6,"pos":463439}],"flag":"BLOCK","start":89401,"end":89472,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463328},"to":{"change":6,"start":27985,"end":28011},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28011},"to":{"change":6,"start":463351,"end":463369},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463351},"to":{"change":6,"start":463351,"end":463369},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463369},"to":{"change":6,"start":28012,"end":28062},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":28062},"to":{"change":6,"start":463413,"end":463439},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463413},"to":{"change":6,"start":463413,"end":463439},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463439},"to":{"change":6,"start":44544,"end":44558},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44558},"to":{"change":6,"start":28063,"end":28074},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28074},"to":{"change":6,"start":1762,"end":1773},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":292,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463447},"to":{"change":6,"start":28075,"end":28154},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel, \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":304,"ins":{"up_context":[{"change":6,"pos":463883}],"down_context":[{"change":6,"pos":463945}],"flag":"BLOCK","start":89473,"end":89531,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":463883},"to":{"change":6,"start":28155,"end":28223},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_alice = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":310,"ins":{"up_context":[{"change":6,"pos":464130}],"down_context":[{"change":6,"pos":464214}],"flag":"BLOCK","start":89532,"end":89632,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":464130},"to":{"change":6,"start":28224,"end":28303},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28303},"to":{"change":6,"start":1774,"end":1827},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" txn_alice.write().add_file(\"file\", 0)?;"}],"del_contents":[{"Del":" let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));\n"},{"Del":" txn_alice.write().unwrap().add_file(\"file\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":313,"ins":{"up_context":[{"change":6,"pos":464215}],"down_context":[{"change":6,"pos":464371}],"flag":"BLOCK","start":89633,"end":89789,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":464215},"to":{"change":6,"start":28354,"end":28440},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28440},"to":{"change":6,"start":28440,"end":28469},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28469},"to":{"change":6,"start":28469,"end":28497},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28497},"to":{"change":6,"start":28497,"end":28587},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = (&mut *txn_alice.write()).open_or_create_channel(\"main\")?;"},{"Add":" let alice0 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel(\"main\")?;\n"},{"Del":" let alice0 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":316,"ins":{"up_context":[{"change":6,"pos":464408}],"down_context":[{"change":6,"pos":464544}],"flag":"BLOCK","start":89790,"end":89890,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":464408},"to":{"change":6,"start":28588,"end":28665},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28665},"to":{"change":6,"start":1828,"end":1973},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn_alice.write().add_dir(\"dir\", 0)?;"},{"Add":" txn_alice.write().move_file(\"file\", \"dir/file2\", 0)?;"}],"del_contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug0\").unwrap();\n"},{"Del":" txn_alice.write().unwrap().add_dir(\"dir\", 0)?;\n txn_alice\n .write()\n .unwrap()\n .move_file(\"file\", \"dir/file2\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":321,"ins":{"up_context":[{"change":6,"pos":464621}],"down_context":[{"change":6,"pos":464753}],"flag":"BLOCK","start":89891,"end":90021,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":464621},"to":{"change":6,"start":28778,"end":28838},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28838},"to":{"change":6,"start":28838,"end":28867},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28867},"to":{"change":6,"start":28867,"end":28895},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":28895},"to":{"change":6,"start":28895,"end":28985},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" debug_tree(&*txn_alice.read(), \"debug_tree\")?;"},{"Add":" let alice1 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" debug_tree(&*txn_alice.read().unwrap(), \"debug_tree\")?;\n"},{"Del":" let alice1 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":324,"ins":{"up_context":[{"change":6,"pos":464790}],"down_context":[{"change":6,"pos":464919}],"flag":"BLOCK","start":90022,"end":90111,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":464790},"to":{"change":6,"start":28986,"end":29170},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" debug_tree(&*txn_alice.read(), \"debug_tree\")?;"},{"Add":" debug_inodes(&*txn_alice.read());"}],"del_contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug1\").unwrap();\n debug_tree(&*txn_alice.read().unwrap(), \"debug_tree\")?;\n debug_inodes(&*txn_alice.read().unwrap());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":330,"ins":{"up_context":[{"change":6,"pos":465026}],"down_context":[{"change":6,"pos":465200}],"flag":"BLOCK","start":90112,"end":90224,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465026},"to":{"change":6,"start":29171,"end":29200},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29200},"to":{"change":6,"start":29200,"end":29228},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29228},"to":{"change":6,"start":29228,"end":29318},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29318},"to":{"change":6,"start":29318,"end":29427},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let alice2 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"},{"Add":" txn_alice.commit().unwrap();"}],"del_contents":[{"Del":" let alice2 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug2\").unwrap();\n commit(txn_alice).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":333,"ins":{"up_context":[{"change":6,"pos":465201}],"down_context":[{"change":6,"pos":465261}],"flag":"BLOCK","start":90225,"end":90281,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465201},"to":{"change":6,"start":29428,"end":29494},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_bob = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":335,"ins":{"up_context":[{"change":6,"pos":465323}],"down_context":[{"change":6,"pos":29654}],"flag":"BLOCK","start":90282,"end":90409,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465323},"to":{"change":6,"start":29495,"end":29654},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel = (&mut *txn_bob.write()).open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn_bob = Arc::new(RwLock::new(env_bob.mut_txn_begin().unwrap()));\n let channel = (&mut *txn_bob.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":339,"ins":{"up_context":[{"change":6,"pos":29697}],"down_context":[{"change":6,"pos":29777}],"flag":"BLOCK","start":90410,"end":90472,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29697},"to":{"change":6,"start":29697,"end":29777},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &mut *txn_bob.write(),"},{"Add":" &mut *channel.write(),"}],"del_contents":[{"Del":" &mut *txn_bob.write().unwrap(),\n &mut *channel.write().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":344,"ins":{"up_context":[{"change":6,"pos":465547}],"down_context":[{"change":6,"pos":465658}],"flag":"BLOCK","start":90473,"end":90544,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465547},"to":{"change":6,"start":29803,"end":29829},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29829},"to":{"change":6,"start":465570,"end":465588},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465570},"to":{"change":6,"start":465570,"end":465588},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465588},"to":{"change":6,"start":29830,"end":29880},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":29880},"to":{"change":6,"start":465632,"end":465658},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465632},"to":{"change":6,"start":465632,"end":465658},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465658},"to":{"change":6,"start":44633,"end":44647},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44647},"to":{"change":6,"start":29881,"end":29892},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29892},"to":{"change":6,"start":1974,"end":1985},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":350,"ins":{"up_context":[{"change":6,"pos":29936}],"down_context":[{"change":6,"pos":30016}],"flag":"BLOCK","start":90545,"end":90607,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":29936},"to":{"change":6,"start":29936,"end":30016},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &mut *txn_bob.write(),"},{"Add":" &mut *channel.write(),"}],"del_contents":[{"Del":" &mut *txn_bob.write().unwrap(),\n &mut *channel.write().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":355,"ins":{"up_context":[{"change":6,"pos":465831}],"down_context":[{"change":6,"pos":465942}],"flag":"BLOCK","start":90608,"end":90679,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465831},"to":{"change":6,"start":30042,"end":30068},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30068},"to":{"change":6,"start":465854,"end":465872},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465854},"to":{"change":6,"start":465854,"end":465872},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465872},"to":{"change":6,"start":30069,"end":30119},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30119},"to":{"change":6,"start":465916,"end":465942},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465916},"to":{"change":6,"start":465916,"end":465942},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":465942},"to":{"change":6,"start":44722,"end":44736},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44736},"to":{"change":6,"start":30120,"end":30131},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30131},"to":{"change":6,"start":1986,"end":1997},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":363,"ins":{"up_context":[{"change":6,"pos":30175}],"down_context":[{"change":6,"pos":30255}],"flag":"BLOCK","start":90680,"end":90742,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30175},"to":{"change":6,"start":30175,"end":30255},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &mut *txn_bob.write(),"},{"Add":" &mut *channel.write(),"}],"del_contents":[{"Del":" &mut *txn_bob.write().unwrap(),\n &mut *channel.write().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":368,"ins":{"up_context":[{"change":6,"pos":466172}],"down_context":[{"change":6,"pos":466283}],"flag":"BLOCK","start":90743,"end":90814,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466172},"to":{"change":6,"start":30281,"end":30307},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30307},"to":{"change":6,"start":466195,"end":466213},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466195},"to":{"change":6,"start":466195,"end":466213},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466213},"to":{"change":6,"start":30308,"end":30342},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":30342},"to":{"change":6,"start":466257,"end":466283},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466257},"to":{"change":6,"start":466257,"end":466283},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466283},"to":{"change":6,"start":44811,"end":44825},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44825},"to":{"change":6,"start":30343,"end":30354},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30354},"to":{"change":6,"start":1998,"end":2009},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob,\n channel,\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":380,"ins":{"up_context":[{"change":6,"pos":466500}],"down_context":[{"change":6,"pos":466562}],"flag":"BLOCK","start":90815,"end":90873,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466500},"to":{"change":6,"start":30355,"end":30423},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_alice = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":387,"ins":{"up_context":[{"change":6,"pos":466813}],"down_context":[{"change":6,"pos":466931}],"flag":"BLOCK","start":90874,"end":91019,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466813},"to":{"change":6,"start":30424,"end":30503},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30503},"to":{"change":6,"start":2010,"end":2117},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" txn_alice.write().add_file(\"file\", 0)?;"},{"Add":" txn_alice.write().add_file(\"file2\", 0)?;"}],"del_contents":[{"Del":" let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));\n"},{"Del":" txn_alice.write().unwrap().add_file(\"file\", 0)?;\n txn_alice.write().unwrap().add_file(\"file2\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":391,"ins":{"up_context":[{"change":6,"pos":466932}],"down_context":[{"change":6,"pos":467118}],"flag":"BLOCK","start":91020,"end":91217,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":466932},"to":{"change":6,"start":30605,"end":30691},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30691},"to":{"change":6,"start":30691,"end":30707},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30707},"to":{"change":6,"start":30707,"end":30735},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30735},"to":{"change":6,"start":30735,"end":30825},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30825},"to":{"change":6,"start":2118,"end":2181},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = (&mut *txn_alice.write()).open_or_create_channel(\"main\")?;"},{"Add":" record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"},{"Add":" txn_alice.write().move_file(\"file\", \"file2\", 0)?;"}],"del_contents":[{"Del":" let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel(\"main\")?;\n"},{"Del":" record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" txn_alice.write().unwrap().move_file(\"file\", \"file2\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":395,"ins":{"up_context":[{"change":6,"pos":467159}],"down_context":[{"change":6,"pos":467295}],"flag":"BLOCK","start":91218,"end":91284,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":467159},"to":{"change":6,"start":30886,"end":30902},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30902},"to":{"change":6,"start":30902,"end":30930},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":30930},"to":{"change":6,"start":30930,"end":31020},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31020},"to":{"change":6,"start":31020,"end":31097},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":415,"ins":{"up_context":[{"change":6,"pos":467711}],"down_context":[{"change":6,"pos":467773}],"flag":"BLOCK","start":91285,"end":91343,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":467711},"to":{"change":6,"start":31098,"end":31166},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_alice = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":421,"ins":{"up_context":[{"change":6,"pos":467955}],"down_context":[{"change":6,"pos":468036}],"flag":"BLOCK","start":91344,"end":91441,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":467955},"to":{"change":6,"start":31167,"end":31246},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31246},"to":{"change":6,"start":2182,"end":2232},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" txn_alice.write().add_file(\"a\", 0)?;"}],"del_contents":[{"Del":" let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));\n"},{"Del":" txn_alice.write().unwrap().add_file(\"a\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":424,"ins":{"up_context":[{"change":6,"pos":468037}],"down_context":[{"change":6,"pos":468193}],"flag":"BLOCK","start":91442,"end":91590,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468037},"to":{"change":6,"start":31294,"end":31372},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31372},"to":{"change":6,"start":31372,"end":31401},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31401},"to":{"change":6,"start":31401,"end":31429},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31429},"to":{"change":6,"start":31429,"end":31519},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = txn_alice.write().open_or_create_channel(\"main\")?;"},{"Add":" let alice1 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = txn_alice.write().unwrap().open_or_create_channel(\"main\")?;\n"},{"Del":" let alice1 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":427,"ins":{"up_context":[{"change":6,"pos":468219}],"down_context":[{"change":6,"pos":468255}],"flag":"BLOCK","start":91591,"end":91638,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468219},"to":{"change":6,"start":2233,"end":2289},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"a\", \"b\", 0)?;"}],"del_contents":[{"Del":" txn_alice.write().unwrap().move_file(\"a\", \"b\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":429,"ins":{"up_context":[{"change":6,"pos":468289}],"down_context":[{"change":6,"pos":468438}],"flag":"BLOCK","start":91639,"end":91718,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468289},"to":{"change":6,"start":31574,"end":31603},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31603},"to":{"change":6,"start":31603,"end":31631},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31631},"to":{"change":6,"start":31631,"end":31721},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31721},"to":{"change":6,"start":31721,"end":31798},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let alice2 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let alice2 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":432,"ins":{"up_context":[{"change":6,"pos":468470}],"down_context":[{"change":6,"pos":468506}],"flag":"BLOCK","start":91719,"end":91766,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468470},"to":{"change":6,"start":2290,"end":2346},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"b\", \"a\", 0)?;"}],"del_contents":[{"Del":" txn_alice.write().unwrap().move_file(\"b\", \"a\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":434,"ins":{"up_context":[{"change":6,"pos":468540}],"down_context":[{"change":6,"pos":468689}],"flag":"BLOCK","start":91767,"end":91846,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468540},"to":{"change":6,"start":31853,"end":31882},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31882},"to":{"change":6,"start":31882,"end":31910},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31910},"to":{"change":6,"start":31910,"end":32000},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32000},"to":{"change":6,"start":32000,"end":32077},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let alice3 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let alice3 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":437,"ins":{"up_context":[{"change":6,"pos":468744}],"down_context":[{"change":6,"pos":468804}],"flag":"BLOCK","start":91847,"end":91903,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468744},"to":{"change":6,"start":32078,"end":32144},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_bob = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_bob = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":439,"ins":{"up_context":[{"change":6,"pos":468866}],"down_context":[{"change":6,"pos":468980}],"flag":"BLOCK","start":91904,"end":92035,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":468866},"to":{"change":6,"start":32145,"end":32308},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_bob = env_bob.arc_txn_begin().unwrap();"},{"Add":" let channel_bob = (&mut *txn_bob.write()).open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn_bob = Arc::new(RwLock::new(env_bob.mut_txn_begin().unwrap()));\n let channel_bob = (&mut *txn_bob.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":443,"ins":{"up_context":[{"change":6,"pos":32326}],"down_context":[{"change":6,"pos":469050}],"flag":"BLOCK","start":92036,"end":92104,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32326},"to":{"change":6,"start":32326,"end":32421},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &alice1)"}],"del_contents":[{"Del":" .unwrap()\n .apply_change(&changes, &mut *channel_bob.write().unwrap(), &alice1)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":446,"ins":{"up_context":[{"change":6,"pos":469111}],"down_context":[{"change":6,"pos":469134}],"flag":"BLOCK","start":92105,"end":92124,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469111},"to":{"change":6,"start":32422,"end":32448},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":448,"ins":{"up_context":[{"change":6,"pos":469152}],"down_context":[{"change":6,"pos":469200}],"flag":"BLOCK","start":92125,"end":92165,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469152},"to":{"change":6,"start":32449,"end":32503},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" txn_bob.clone(),\n channel_bob.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":457,"ins":{"up_context":[{"change":6,"pos":469266}],"down_context":[{"change":6,"pos":469489}],"flag":"BLOCK","start":92166,"end":92339,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469266},"to":{"change":6,"start":32516,"end":32543},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32543},"to":{"change":6,"start":32543,"end":32569},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32569},"to":{"change":6,"start":32569,"end":32661},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":32661},"to":{"change":6,"start":32661,"end":32858},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let bob1 = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"},{"Add":" (&mut *txn_bob.write())"},{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &alice2)"}],"del_contents":[{"Del":" let bob1 = record_all(\n"},{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n txn_bob.clone(),\n channel_bob.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, \"debug_bob1\").unwrap();\n (&mut *txn_bob.write().unwrap())\n .apply_change(&changes, &mut *channel_bob.write().unwrap(), &alice2)\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":461,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469508},"to":{"change":6,"start":32859,"end":32942},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, \"debug_bob2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":462,"ins":{"up_context":[{"change":6,"pos":469614}],"down_context":[{"change":6,"pos":469725}],"flag":"BLOCK","start":92340,"end":92411,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469614},"to":{"change":6,"start":32943,"end":32969},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":32969},"to":{"change":6,"start":469637,"end":469655},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469637},"to":{"change":6,"start":469637,"end":469655},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469655},"to":{"change":6,"start":32970,"end":33020},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33020},"to":{"change":6,"start":469699,"end":469725},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469699},"to":{"change":6,"start":469699,"end":469725},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469725},"to":{"change":6,"start":44961,"end":44975},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44975},"to":{"change":6,"start":33021,"end":33032},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33032},"to":{"change":6,"start":2359,"end":2370},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":467,"ins":{"up_context":[{"change":6,"pos":33050}],"down_context":[{"change":6,"pos":469840}],"flag":"BLOCK","start":92412,"end":92480,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33050},"to":{"change":6,"start":33050,"end":33145},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut *channel_bob.write(), &alice3)"}],"del_contents":[{"Del":" .unwrap()\n .apply_change(&changes, &mut *channel_bob.write().unwrap(), &alice3)\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":469,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469859},"to":{"change":6,"start":33146,"end":33229},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, \"debug_bob3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":470,"ins":{"up_context":[{"change":6,"pos":469965}],"down_context":[{"change":6,"pos":470076}],"flag":"BLOCK","start":92481,"end":92552,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469965},"to":{"change":6,"start":33230,"end":33256},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33256},"to":{"change":6,"start":469988,"end":470006},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":469988},"to":{"change":6,"start":469988,"end":470006},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470006},"to":{"change":6,"start":33257,"end":33307},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":33307},"to":{"change":6,"start":470050,"end":470076},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470050},"to":{"change":6,"start":470050,"end":470076},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470076},"to":{"change":6,"start":45036,"end":45050},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":45050},"to":{"change":6,"start":33308,"end":33319},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33319},"to":{"change":6,"start":2371,"end":2382},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob, &changes, &txn_bob, &channel, \"\", true, None, 1, 0,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n"},{"Del":" txn_bob.clone(),\n channel.clone(),\n"},{"Del":" \"\",\n true,\n"},{"Del":" None,\n"},{"Del":" 1,\n"},{"Del":" 0,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":475,"ins":{"up_context":[{"change":6,"pos":470156}],"down_context":[{"change":6,"pos":470317}],"flag":"BLOCK","start":92553,"end":92634,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470156},"to":{"change":6,"start":33320,"end":33351},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33351},"to":{"change":6,"start":33351,"end":33381},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33381},"to":{"change":6,"start":33381,"end":33493},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33493},"to":{"change":6,"start":33493,"end":33580},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let bob2 = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let bob2 = record_all(\n"},{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n txn_bob.clone(),\n channel_bob.clone(),\n \"\",\n )?;\n"},{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, \"debug_bob4\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":480,"ins":{"up_context":[{"change":6,"pos":33602}],"down_context":[{"change":6,"pos":470430}],"flag":"BLOCK","start":92635,"end":92701,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33602},"to":{"change":6,"start":33602,"end":33699},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut *channel.write(), &bob1)"}],"del_contents":[{"Del":" .unwrap()\n .apply_change(&changes, &mut *channel.write().unwrap(), &bob1)\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":482,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470453},"to":{"change":6,"start":33700,"end":33787},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":484,"ins":{"up_context":[{"change":6,"pos":470584}],"down_context":[{"change":6,"pos":470613}],"flag":"BLOCK","start":92702,"end":92727,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470584},"to":{"change":6,"start":33788,"end":33820},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":486,"ins":{"up_context":[{"change":6,"pos":470635}],"down_context":[{"change":6,"pos":470689}],"flag":"BLOCK","start":92728,"end":92774,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470635},"to":{"change":6,"start":33821,"end":33881},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn_alice.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":500,"ins":{"up_context":[{"change":6,"pos":33919}],"down_context":[{"change":6,"pos":470939}],"flag":"BLOCK","start":92775,"end":92841,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33919},"to":{"change":6,"start":33919,"end":34016},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut *channel.write(), &bob2)"}],"del_contents":[{"Del":" .unwrap()\n .apply_change(&changes, &mut *channel.write().unwrap(), &bob2)\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":502,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":470962},"to":{"change":6,"start":34017,"end":34104},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug_alice3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":503,"ins":{"up_context":[{"change":6,"pos":471092}],"down_context":[{"change":6,"pos":471121}],"flag":"BLOCK","start":92842,"end":92867,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471092},"to":{"change":6,"start":34105,"end":34137},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":505,"ins":{"up_context":[{"change":6,"pos":471143}],"down_context":[{"change":6,"pos":471197}],"flag":"BLOCK","start":92868,"end":92914,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471143},"to":{"change":6,"start":34138,"end":34198},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn_alice.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":518,"ins":{"up_context":[{"change":6,"pos":471436}],"down_context":[{"change":6,"pos":471463}],"flag":"BLOCK","start":92915,"end":92938,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471436},"to":{"change":6,"start":34215,"end":34245},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":520,"ins":{"up_context":[{"change":6,"pos":471485}],"down_context":[{"change":6,"pos":471541}],"flag":"BLOCK","start":92939,"end":92987,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471485},"to":{"change":6,"start":34246,"end":34308},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" txn_bob.clone(),\n channel_bob.clone(),\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":528,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471587},"to":{"change":6,"start":34325,"end":34412},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, \"debug_bob4\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":532,"ins":{"up_context":[{"change":6,"pos":471800}],"down_context":[{"change":6,"pos":471827}],"flag":"BLOCK","start":92988,"end":93011,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471800},"to":{"change":6,"start":34413,"end":34443},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" repo_bob.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":534,"ins":{"up_context":[{"change":6,"pos":471849}],"down_context":[{"change":6,"pos":471905}],"flag":"BLOCK","start":93012,"end":93060,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471849},"to":{"change":6,"start":34444,"end":34506},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" txn_bob.clone(),\n channel_bob.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":544,"ins":{"up_context":[{"change":6,"pos":471994}],"down_context":[{"change":6,"pos":472087}],"flag":"BLOCK","start":93061,"end":93142,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":471994},"to":{"change":6,"start":34523,"end":34554},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":34554},"to":{"change":6,"start":34554,"end":34584},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":34584},"to":{"change":6,"start":34584,"end":34696},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let bob2 = record_all(&repo_bob, &changes, &txn_bob, &channel_bob, \"\")?;"}],"del_contents":[{"Del":" let bob2 = record_all(\n"},{"Del":" repo_bob.clone(),\n"},{"Del":" &changes,\n txn_bob.clone(),\n channel_bob.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":549,"ins":{"up_context":[{"change":6,"pos":34718}],"down_context":[{"change":6,"pos":472200}],"flag":"BLOCK","start":93143,"end":93209,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":34718},"to":{"change":6,"start":34718,"end":34815},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut *channel.write(), &bob1)"}],"del_contents":[{"Del":" .unwrap()\n .apply_change(&changes, &mut *channel.write().unwrap(), &bob1)\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":551,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":472223},"to":{"change":6,"start":34816,"end":34903},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug_alice2\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":553,"ins":{"up_context":[{"change":6,"pos":472354}],"down_context":[{"change":6,"pos":472383}],"flag":"BLOCK","start":93210,"end":93235,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":472354},"to":{"change":6,"start":34904,"end":34936},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":555,"ins":{"up_context":[{"change":6,"pos":472405}],"down_context":[{"change":6,"pos":472459}],"flag":"BLOCK","start":93236,"end":93282,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":472405},"to":{"change":6,"start":34937,"end":34997},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn_alice.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":573,"ins":{"up_context":[{"change":6,"pos":35035}],"down_context":[{"change":6,"pos":472881}],"flag":"BLOCK","start":93283,"end":93349,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35035},"to":{"change":6,"start":35035,"end":35132},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .apply_change(&changes, &mut *channel.write(), &bob2)"}],"del_contents":[{"Del":" .unwrap()\n .apply_change(&changes, &mut *channel.write().unwrap(), &bob2)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":576,"ins":{"up_context":[{"change":6,"pos":472966}],"down_context":[{"change":6,"pos":472995}],"flag":"BLOCK","start":93350,"end":93375,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":472966},"to":{"change":6,"start":35133,"end":35165},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":578,"ins":{"up_context":[{"change":6,"pos":473017}],"down_context":[{"change":6,"pos":473071}],"flag":"BLOCK","start":93376,"end":93422,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":473017},"to":{"change":6,"start":35166,"end":35226},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn_alice.clone(),\n channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":591,"ins":{"up_context":[{"change":6,"pos":473310}],"down_context":[{"change":6,"pos":473337}],"flag":"BLOCK","start":93423,"end":93446,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":473310},"to":{"change":6,"start":35243,"end":35265},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_bob,"}],"del_contents":[{"Del":" repo_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":593,"ins":{"up_context":[{"change":6,"pos":473359}],"down_context":[{"change":6,"pos":473415}],"flag":"BLOCK","start":93447,"end":93495,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":473359},"to":{"change":6,"start":35266,"end":35312},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_bob,"},{"Add":" &channel_bob,"}],"del_contents":[{"Del":" txn_bob,\n channel_bob,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":612,"ins":{"up_context":[{"change":6,"pos":473753}],"down_context":[{"change":6,"pos":473815}],"flag":"BLOCK","start":93496,"end":93554,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":473753},"to":{"change":6,"start":35329,"end":35397},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo_alice = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo_alice = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":619,"ins":{"up_context":[{"change":6,"pos":474074}],"down_context":[{"change":6,"pos":474200}],"flag":"BLOCK","start":93555,"end":93708,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474074},"to":{"change":6,"start":35398,"end":35477},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35477},"to":{"change":6,"start":2495,"end":2610},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn_alice = env_alice.arc_txn_begin().unwrap();"},{"Add":" txn_alice.write().add_file(\"dir/file\", 0)?;"},{"Add":" txn_alice.write().add_file(\"dir/file2\", 0)?;"}],"del_contents":[{"Del":" let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));\n"},{"Del":" txn_alice.write().unwrap().add_file(\"dir/file\", 0)?;\n txn_alice.write().unwrap().add_file(\"dir/file2\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":623,"ins":{"up_context":[{"change":6,"pos":474201}],"down_context":[{"change":6,"pos":474357}],"flag":"BLOCK","start":93709,"end":93865,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474201},"to":{"change":6,"start":35587,"end":35673},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35673},"to":{"change":6,"start":35673,"end":35702},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35702},"to":{"change":6,"start":35702,"end":35730},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35730},"to":{"change":6,"start":35730,"end":35820},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = (&mut *txn_alice.write()).open_or_create_channel(\"main\")?;"},{"Add":" let alice0 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel(\"main\")?;\n"},{"Del":" let alice0 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":626,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474394},"to":{"change":6,"start":35821,"end":35898},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug0\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":630,"ins":{"up_context":[{"change":6,"pos":474620}],"down_context":[{"change":6,"pos":474724}],"flag":"BLOCK","start":93866,"end":93992,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474620},"to":{"change":6,"start":35899,"end":35948},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35948},"to":{"change":6,"start":2611,"end":2660},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2660},"to":{"change":6,"start":35994,"end":36043},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35994},"to":{"change":6,"start":35994,"end":36043},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36043},"to":{"change":6,"start":2661,"end":2712},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn_alice.write().move_file(\"dir/file\", \"dir2/file\", 0)?;"},{"Add":" txn_alice.write().move_file(\"dir/file2\", \"dir2/file2\", 0)?;"}],"del_contents":[{"Del":" txn_alice\n .write()\n .unwrap()\n"},{"Del":" .move_file(\"dir/file\", \"dir2/file\", 0)?;\n"},{"Del":" txn_alice\n .write()\n .unwrap()\n"},{"Del":" .move_file(\"dir/file2\", \"dir2/file2\", 0)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":633,"ins":{"up_context":[{"change":6,"pos":474725}],"down_context":[{"change":6,"pos":474816}],"flag":"BLOCK","start":93993,"end":94072,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474725},"to":{"change":6,"start":36092,"end":36121},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36121},"to":{"change":6,"start":36121,"end":36149},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36149},"to":{"change":6,"start":36149,"end":36239},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let alice1 = record_all(&repo_alice, &changes, &txn_alice, &channel, \"\")?;"}],"del_contents":[{"Del":" let alice1 = record_all(\n"},{"Del":" repo_alice.clone(),\n"},{"Del":" &changes,\n txn_alice.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":635,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474853},"to":{"change":6,"start":36240,"end":36317},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug1\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":636,"ins":{"up_context":[{"change":6,"pos":474953}],"down_context":[{"change":6,"pos":474978}],"flag":"BLOCK","start":94073,"end":94094,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474953},"to":{"change":6,"start":36318,"end":36346},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":638,"ins":{"up_context":[{"change":6,"pos":474996}],"down_context":[{"change":6,"pos":475042}],"flag":"BLOCK","start":94095,"end":94133,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":474996},"to":{"change":6,"start":36347,"end":36399},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &txn_alice,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn_alice.clone(),\n channel.clone(),\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":646,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":475076},"to":{"change":6,"start":36412,"end":36489},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug2\").unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":651,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36521},"to":{"change":6,"start":36521,"end":36539},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" .unwrap()\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":655,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36638},"to":{"change":6,"start":36638,"end":36656},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" .unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":665,"ins":{"up_context":[{"change":6,"pos":36780}],"down_context":[{"change":6,"pos":475616}],"flag":"BLOCK","start":94134,"end":94155,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36780},"to":{"change":6,"start":36780,"end":36808},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":675,"ins":{"up_context":[{"change":6,"pos":36874}],"down_context":[{"change":6,"pos":475809}],"flag":"BLOCK","start":94156,"end":94177,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":36874},"to":{"change":6,"start":36874,"end":36902},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &repo_alice,"}],"del_contents":[{"Del":" repo_alice.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":685,"ins":{"up_context":[{"change":6,"pos":475943}],"down_context":[{"change":6,"pos":475989}],"flag":"BLOCK","start":94178,"end":94241,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":475943},"to":{"change":6,"start":36915,"end":36987},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn_alice.read()).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(&*txn_alice.read().unwrap()).unwrap())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":688,"ins":{"up_context":[{"change":6,"pos":476062}],"down_context":[{"change":6,"pos":476082}],"flag":"BLOCK","start":94242,"end":94270,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":476062},"to":{"change":6,"start":36988,"end":37025},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &*txn_alice.read(),"}],"del_contents":[{"Del":" &*txn_alice.read().unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":691,"ins":{"up_context":[{"change":6,"pos":476118}],"down_context":[{"change":6,"pos":476140}],"flag":"BLOCK","start":94271,"end":94321,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":476118},"to":{"change":6,"start":37026,"end":37085},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" std::mem::take(&mut rec.contents.lock()),"}],"del_contents":[{"Del":" std::mem::take(&mut rec.contents.lock().unwrap()),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":703,"ins":{"up_context":[{"change":6,"pos":476433}],"down_context":[{"change":6,"pos":37128}],"flag":"BLOCK","start":94322,"end":94355,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":476433},"to":{"change":6,"start":37086,"end":37128},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" &mut *txn_alice.write(),"}],"del_contents":[{"Del":" &mut *txn_alice.write().unwrap(),\n"}]}},{"Edit":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":711,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":476583},"to":{"change":6,"start":37147,"end":37224},"introduced_by":6}],"inode":{"change":6,"pos":454125}}},"contents":[{"Del":" debug_to_file(&*txn_alice.read().unwrap(), &channel, \"debug3\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":712,"ins":{"up_context":[{"change":6,"pos":476642}],"down_context":[{"change":6,"pos":476704}],"flag":"BLOCK","start":94356,"end":94441,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":476642},"to":{"change":6,"start":37225,"end":37336},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let (alive, reachable) = check_alive(&*txn_alice.read(), &channel.read().graph);"}],"del_contents":[{"Del":" let (alive, reachable) =\n check_alive(&*txn_alice.read().unwrap(), &channel.read().unwrap().graph);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":731,"ins":{"up_context":[{"change":6,"pos":477104}],"down_context":[{"change":6,"pos":477160}],"flag":"BLOCK","start":94442,"end":94494,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":477104},"to":{"change":6,"start":37337,"end":37399},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":736,"ins":{"up_context":[{"change":6,"pos":477335}],"down_context":[{"change":6,"pos":477412}],"flag":"BLOCK","start":94495,"end":94588,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":477335},"to":{"change":6,"start":37400,"end":37467},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37467},"to":{"change":6,"start":2823,"end":2881},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"filedir\", 0).unwrap();"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"filedir\", 0).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":739,"ins":{"up_context":[{"change":6,"pos":477413}],"down_context":[{"change":6,"pos":477554}],"flag":"BLOCK","start":94589,"end":94730,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":477413},"to":{"change":6,"start":37468,"end":37657},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let channel = (&mut *txn.write()).open_or_create_channel(\"main\").unwrap();"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" let channel = (&mut *txn.write().unwrap())\n .open_or_create_channel(\"main\")\n .unwrap();\n record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":744,"ins":{"up_context":[{"change":6,"pos":477664}],"down_context":[{"change":6,"pos":477832}],"flag":"BLOCK","start":94731,"end":94847,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":477664},"to":{"change":6,"start":2882,"end":2945},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2945},"to":{"change":6,"start":37658,"end":37811},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":40214},"to":{"change":6,"start":37658,"end":37811},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn.write().add_file(\"filedir/file\", 0).unwrap();"},{"Add":" record_all(&repo, &changes, &txn, &channel, \"\").unwrap();"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"filedir/file\", 0).unwrap();\n"},{"Del":" record_all(repo.clone(), &changes, txn.clone(), channel.clone(), \"\").unwrap();\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":754,"ins":{"up_context":[{"change":6,"pos":477954}],"down_context":[{"change":6,"pos":478010}],"flag":"BLOCK","start":94848,"end":94900,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":477954},"to":{"change":6,"start":37812,"end":37874},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":759,"ins":{"up_context":[{"change":6,"pos":478129}],"down_context":[{"change":6,"pos":31708}],"flag":"BLOCK","start":94901,"end":95226,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":478129},"to":{"change":6,"start":37875,"end":37946},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37946},"to":{"change":6,"start":2946,"end":3001},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3001},"to":{"change":6,"start":37947,"end":38283},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":40319},"to":{"change":6,"start":37947,"end":38283},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" txn.write().add_file(\"dir/file\", 0)?;"},{"Add":" let channel = (&mut *txn.write()).open_or_create_channel(\"main\")?;"},{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n"},{"Del":" txn.write().unwrap().add_file(\"dir/file\", 0)?;\n"},{"Del":" let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n record_all_output(repo, changes.clone(), txn.clone(), channel.clone(), \"\")?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":775,"ins":{"up_context":[{"change":6,"pos":478693}],"down_context":[{"change":6,"pos":478749}],"flag":"BLOCK","start":95227,"end":95279,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":478693},"to":{"change":6,"start":38284,"end":38346},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":780,"ins":{"up_context":[{"change":6,"pos":478868}],"down_context":[{"change":6,"pos":31744}],"flag":"BLOCK","start":95280,"end":95543,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":478868},"to":{"change":6,"start":38347,"end":38746},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = txn.write().open_or_create_channel(\"main\")?;"},{"Add":" record_all_output(&repo, changes, &txn, &channel, \"\")?;"},{"Add":" let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read(), Inode::ROOT)"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = txn.write().unwrap().open_or_create_channel(\"main\")?;\n record_all_output(repo.clone(), changes, txn.clone(), channel.clone(), \"\")?;\n debug_to_file(&*txn.read().unwrap(), &channel, \"debug\").unwrap();\n let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":795,"ins":{"up_context":[{"change":6,"pos":479402}],"down_context":[{"change":6,"pos":479458}],"flag":"BLOCK","start":95544,"end":95596,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":479402},"to":{"change":6,"start":38747,"end":38809},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":799,"ins":{"up_context":[{"change":6,"pos":479571}],"down_context":[{"change":6,"pos":479762}],"flag":"BLOCK","start":95597,"end":95792,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":479571},"to":{"change":6,"start":38810,"end":39034},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = (&mut *txn.write()).open_or_create_channel(\"main\")?;"},{"Add":" assert!(record_all_output(&repo, changes, &txn, &channel, \"dir\").is_err());"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n assert!(record_all_output(repo, changes, txn, channel, \"dir\").is_err());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":809,"ins":{"up_context":[{"change":6,"pos":479883}],"down_context":[{"change":6,"pos":479939}],"flag":"BLOCK","start":95793,"end":95845,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":479883},"to":{"change":6,"start":39035,"end":39097},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let repo = working_copy::memory::Memory::new();"}],"del_contents":[{"Del":" let repo = Arc::new(working_copy::memory::Memory::new());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":813,"ins":{"up_context":[{"change":6,"pos":480052}],"down_context":[{"change":6,"pos":480150}],"flag":"BLOCK","start":95846,"end":95961,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":480052},"to":{"change":6,"start":39098,"end":39245},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" let txn = env.arc_txn_begin().unwrap();"},{"Add":" let channel = (&mut *txn.write()).open_or_create_channel(\"main\")?;"}],"del_contents":[{"Del":" let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));\n let channel = (&mut *txn.write().unwrap()).open_or_create_channel(\"main\")?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":817,"ins":{"up_context":[{"change":6,"pos":480210}],"down_context":[{"change":6,"pos":480310}],"flag":"BLOCK","start":95962,"end":96068,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":480210},"to":{"change":6,"start":3002,"end":3049},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":3049},"to":{"change":6,"start":39246,"end":39382},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":40827},"to":{"change":6,"start":39246,"end":39382},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" txn.write().add_file(\"file\", 0)?;"},{"Add":" record_all_output(&repo, changes.clone(), &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" txn.write().unwrap().add_file(\"file\", 0)?;\n"},{"Del":" record_all_output(\n repo.clone(),\n changes.clone(),\n txn.clone(),\n channel.clone(),\n \"\",\n )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":454125},"path":"libpijul/src/tests/add_file.rs","line":820,"ins":{"up_context":[{"change":6,"pos":480369}],"down_context":[{"change":6,"pos":480442}],"flag":"BLOCK","start":96069,"end":96129,"inode":{"change":6,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":480369},"to":{"change":6,"start":39383,"end":39440},"introduced_by":6}],"inode":{"change":6,"pos":454125}},"ins_contents":[{"Add":" record_all_output(&repo, changes, &txn, &channel, \"\")?;"}],"del_contents":[{"Del":" record_all_output(repo, changes, txn, channel, \"\")?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":6397},"path":"libpijul/src/tag.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":6545}],"down_context":[{"change":6,"pos":6545}],"flag":"BLOCK","start":96130,"end":96155,"inode":{"change":6,"pos":6397}}},"contents":[{"Add":"use parking_lot::RwLock;"}]}},{"Replacement":{"inode":{"change":6,"pos":6397},"path":"libpijul/src/tag.rs","line":10,"ins":{"up_context":[{"change":6,"pos":6606}],"down_context":[{"change":6,"pos":6636}],"flag":"BLOCK","start":96156,"end":96176,"inode":{"change":6,"pos":6397}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6606},"to":{"change":6,"start":6606,"end":6636},"introduced_by":6}],"inode":{"change":6,"pos":6397}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":6397},"path":"libpijul/src/tag.rs","line":234,"ins":{"up_context":[{"change":6,"pos":12509}],"down_context":[{"change":6,"pos":12573}],"flag":"BLOCK","start":96177,"end":96232,"inode":{"change":6,"pos":6397}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":12509},"to":{"change":6,"start":12509,"end":12573},"introduced_by":6}],"inode":{"change":6,"pos":6397}},"ins_contents":[{"Add":" txn.open_channels.lock().insert(name, br.clone());"}],"del_contents":[{"Del":" txn.open_channels.lock().unwrap().insert(name, br.clone());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":6397},"path":"libpijul/src/tag.rs","line":414,"ins":{"up_context":[{"change":6,"pos":18038}],"down_context":[{"change":6,"pos":18081}],"flag":"BLOCK","start":96233,"end":96267,"inode":{"change":6,"pos":6397}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":18038},"to":{"change":6,"start":18038,"end":18081},"introduced_by":6}],"inode":{"change":6,"pos":6397}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read().unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":12,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":40859}],"down_context":[{"change":6,"pos":40859}],"flag":"BLOCK","start":96268,"end":96292,"inode":{"change":6,"pos":488880}}},"contents":[{"Add":"use parking_lot::Mutex;"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":14,"ins":{"up_context":[{"change":6,"pos":40891}],"down_context":[{"change":6,"pos":11033}],"flag":"BLOCK","start":96293,"end":96313,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":40891},"to":{"change":6,"start":40891,"end":40928},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, Mutex, RwLock};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":154,"ins":{"up_context":[{"change":6,"pos":42655}],"down_context":[{"change":6,"pos":42693}],"flag":"BLOCK","start":96314,"end":96343,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42655},"to":{"change":6,"start":42655,"end":42693},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" rec.into_inner()"}],"del_contents":[{"Del":" rec.into_inner().unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":160,"ins":{"up_context":[{"change":6,"pos":42834}],"down_context":[{"change":6,"pos":42876}],"flag":"BLOCK","start":96344,"end":96377,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":42834},"to":{"change":6,"start":42834,"end":42876},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" rec.into_inner()"}],"del_contents":[{"Del":" rec.into_inner().unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":229,"ins":{"up_context":[{"change":6,"pos":43735}],"down_context":[{"change":6,"pos":43788}],"flag":"BLOCK","start":96378,"end":96428,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":43735},"to":{"change":6,"start":43735,"end":43760},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":43760},"to":{"change":6,"start":43760,"end":43788},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n"},{"Del":" channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":233,"ins":{"up_context":[{"change":6,"pos":43872}],"down_context":[{"change":6,"pos":43952}],"flag":"BLOCK","start":96429,"end":96491,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":43872},"to":{"change":6,"start":43872,"end":43952},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n let channel = channel.r.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":276,"ins":{"up_context":[{"change":6,"pos":44558}],"down_context":[{"change":6,"pos":44606}],"flag":"BLOCK","start":96492,"end":96548,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44558},"to":{"change":6,"start":44558,"end":44606},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" W: WorkingCopy + Clone + Send + Sync + 'static,"}],"del_contents":[{"Del":" W: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":280,"ins":{"up_context":[{"change":6,"pos":492719}],"down_context":[{"change":6,"pos":492740}],"flag":"BLOCK","start":96549,"end":96573,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":492719},"to":{"change":6,"start":44663,"end":44692},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":283,"ins":{"up_context":[{"change":6,"pos":44725}],"down_context":[{"change":6,"pos":492848}],"flag":"BLOCK","start":96574,"end":96600,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44725},"to":{"change":6,"start":44725,"end":44755},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" working_copy: &W,"}],"del_contents":[{"Del":" working_copy: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":312,"ins":{"up_context":[{"change":6,"pos":187}],"down_context":[{"change":6,"pos":248}],"flag":"BLOCK","start":96601,"end":96653,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":187},"to":{"change":6,"start":187,"end":248},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut work = work.lock();"}],"del_contents":[{"Del":" let mut work = work.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":318,"ins":{"up_context":[{"change":6,"pos":532}],"down_context":[{"change":4,"pos":107}],"flag":"BLOCK","start":96654,"end":96745,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":532},"to":{"change":4,"start":0,"end":66},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":66},"to":{"change":4,"start":66,"end":107},"introduced_by":4}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" rec.lock().record_existing_file("},{"Add":" &txn,"}],"del_contents":[{"Del":" rec.lock().unwrap().record_existing_file(\n"},{"Del":" txn.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":321,"ins":{"up_context":[{"change":4,"pos":151}],"down_context":[{"change":4,"pos":196}],"flag":"BLOCK","start":96746,"end":96784,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":151},"to":{"change":4,"start":151,"end":196},"introduced_by":4}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" &channel,"}],"del_contents":[{"Del":" channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":346,"ins":{"up_context":[{"change":6,"pos":493224}],"down_context":[{"change":6,"pos":46989}],"flag":"BLOCK","start":96785,"end":96917,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":493224},"to":{"change":6,"start":46779,"end":46989},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let vertex: Option>> ="},{"Add":" self.recorded_inodes.lock().get(&item.inode).cloned();"}],"del_contents":[{"Del":" let vertex: Option>> = self\n .recorded_inodes\n .lock()\n .unwrap()\n .get(&item.inode)\n .cloned();\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":353,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":47097},"to":{"change":6,"start":47097,"end":47127},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Del":" .unwrap()\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":355,"ins":{"up_context":[{"change":6,"pos":47179}],"down_context":[{"change":6,"pos":47226}],"flag":"BLOCK","start":96918,"end":96956,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":47179},"to":{"change":6,"start":47179,"end":47226},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":357,"ins":{"up_context":[{"change":6,"pos":47259}],"down_context":[{"change":6,"pos":47316}],"flag":"BLOCK","start":96957,"end":97005,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":47259},"to":{"change":6,"start":47259,"end":47316},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let channel = channel.r.read();"}],"del_contents":[{"Del":" let channel = channel.r.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":362,"ins":{"up_context":[{"change":6,"pos":47420}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":97006,"end":97040,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":47420},"to":{"change":6,"start":47420,"end":47463},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" working_copy,"}],"del_contents":[{"Del":" working_copy.as_ref(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":368,"ins":{"up_context":[{"change":6,"pos":493753}],"down_context":[{"change":6,"pos":47563}],"flag":"BLOCK","start":97041,"end":97126,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":493753},"to":{"change":6,"start":47464,"end":47563},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" } else if let Some(vertex) = get_inodes_(&txn, &channel, &item.inode)? {"}],"del_contents":[{"Del":" } else if let Some(vertex) = get_inodes_(txn.clone(), channel.clone(), &item.inode)? {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":370,"ins":{"up_context":[{"change":6,"pos":47581}],"down_context":[{"change":6,"pos":47703}],"flag":"BLOCK","start":97127,"end":97231,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":47581},"to":{"change":6,"start":47581,"end":47703},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut txn = txn.write();"},{"Add":" let mut channel = channel.r.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n let mut channel = channel.r.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":376,"ins":{"up_context":[{"change":6,"pos":47887}],"down_context":[{"change":6,"pos":47934}],"flag":"BLOCK","start":97232,"end":97270,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":47887},"to":{"change":6,"start":47887,"end":47934},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" working_copy,"}],"del_contents":[{"Del":" working_copy.as_ref(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":385,"ins":{"up_context":[{"change":6,"pos":48159}],"down_context":[{"change":6,"pos":48236}],"flag":"BLOCK","start":97271,"end":97339,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":48159},"to":{"change":6,"start":48159,"end":48236},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut recorded = self.recorded_inodes.lock();"}],"del_contents":[{"Del":" let mut recorded = self.recorded_inodes.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":389,"ins":{"up_context":[{"change":6,"pos":48378}],"down_context":[{"change":6,"pos":48431}],"flag":"BLOCK","start":97340,"end":97384,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":48378},"to":{"change":6,"start":48378,"end":48431},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut work = work.lock();"}],"del_contents":[{"Del":" let mut work = work.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":400,"ins":{"up_context":[{"change":6,"pos":48738}],"down_context":[{"change":6,"pos":494533}],"flag":"BLOCK","start":97385,"end":97492,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":48738},"to":{"change":6,"start":48738,"end":48863},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut rec = rec.lock();"},{"Add":" match rec.add_file(working_copy, item.clone()) {"}],"del_contents":[{"Del":" let mut rec = rec.lock().unwrap();\n match rec.add_file(working_copy.as_ref(), item.clone()) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":404,"ins":{"up_context":[{"change":6,"pos":494649}],"down_context":[{"change":6,"pos":494722}],"flag":"BLOCK","start":97493,"end":97573,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":494649},"to":{"change":6,"start":48864,"end":49040},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" self.recorded_inodes.lock().insert(item.inode, vertex);"}],"del_contents":[{"Del":" self.recorded_inodes\n .lock()\n .unwrap()\n .insert(item.inode, vertex);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":413,"ins":{"up_context":[{"change":6,"pos":49088}],"down_context":[{"change":6,"pos":11697}],"flag":"BLOCK","start":97574,"end":97652,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49088},"to":{"change":6,"start":49088,"end":49184},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n let channel = channel.r.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":418,"ins":{"up_context":[{"change":6,"pos":49235}],"down_context":[{"change":6,"pos":495346}],"flag":"BLOCK","start":97653,"end":97683,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49235},"to":{"change":6,"start":49235,"end":49274},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" working_copy,"}],"del_contents":[{"Del":" working_copy.as_ref(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":429,"ins":{"up_context":[{"change":6,"pos":49348}],"down_context":[{"change":6,"pos":49390}],"flag":"BLOCK","start":97684,"end":97717,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49348},"to":{"change":6,"start":49348,"end":49390},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" work.lock().stop = true;"}],"del_contents":[{"Del":" work.lock().unwrap().stop = true;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":435,"ins":{"up_context":[{"change":6,"pos":49503}],"down_context":[{"change":6,"pos":49556}],"flag":"BLOCK","start":97718,"end":97762,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49503},"to":{"change":6,"start":49503,"end":49556},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut work = work.lock();"}],"del_contents":[{"Del":" let mut work = work.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":442,"ins":{"up_context":[{"change":6,"pos":49828}],"down_context":[{"change":4,"pos":513}],"flag":"BLOCK","start":97763,"end":97838,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49828},"to":{"change":4,"start":422,"end":480},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":480},"to":{"change":4,"start":480,"end":513},"introduced_by":4}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" rec.lock().record_existing_file("},{"Add":" &txn,"}],"del_contents":[{"Del":" rec.lock().unwrap().record_existing_file(\n"},{"Del":" txn.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":445,"ins":{"up_context":[{"change":4,"pos":549}],"down_context":[{"change":4,"pos":586}],"flag":"BLOCK","start":97839,"end":97869,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":549},"to":{"change":4,"start":549,"end":586},"introduced_by":4}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" &channel,"}],"del_contents":[{"Del":" channel.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":526,"ins":{"up_context":[{"change":6,"pos":52986}],"down_context":[{"change":6,"pos":53041}],"flag":"BLOCK","start":97870,"end":97916,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52986},"to":{"change":6,"start":52986,"end":53041},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut rec = rec.lock();"}],"del_contents":[{"Del":" let mut rec = rec.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":604,"ins":{"up_context":[{"change":6,"pos":55740}],"down_context":[{"change":6,"pos":1654}],"flag":"BLOCK","start":97917,"end":97959,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":55740},"to":{"change":6,"start":55740,"end":55791},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut rec = rec.lock();"}],"del_contents":[{"Del":" let mut rec = rec.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":654,"ins":{"up_context":[{"change":6,"pos":495974}],"down_context":[{"change":6,"pos":57212}],"flag":"BLOCK","start":97960,"end":98009,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":495974},"to":{"change":6,"start":56834,"end":56892},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut contents = self.contents.lock();"}],"del_contents":[{"Del":" let mut contents = self.contents.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":743,"ins":{"up_context":[{"change":6,"pos":57987}],"down_context":[{"change":6,"pos":33078}],"flag":"BLOCK","start":98010,"end":98042,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":28386},"to":{"change":6,"start":33054,"end":33078},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":57987},"to":{"change":6,"start":33054,"end":33078},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":33054},"to":{"change":6,"start":33054,"end":33078},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" W: WorkingCopy + Clone,"}],"del_contents":[{"Del":" W: WorkingCopy,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":747,"ins":{"up_context":[{"change":6,"pos":499475}],"down_context":[{"change":6,"pos":499496}],"flag":"BLOCK","start":98043,"end":98068,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":499475},"to":{"change":6,"start":57988,"end":58017},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" txn: &ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":749,"ins":{"up_context":[{"change":6,"pos":499537}],"down_context":[{"change":6,"pos":499597}],"flag":"BLOCK","start":98069,"end":98127,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":499537},"to":{"change":6,"start":58018,"end":58050},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":58050},"to":{"change":6,"start":58050,"end":58080},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" channel: &ChannelRef,"},{"Add":" working_copy: W,"}],"del_contents":[{"Del":" channel: ChannelRef,\n"},{"Del":" working_copy: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":768,"ins":{"up_context":[{"change":6,"pos":500045}],"down_context":[{"change":6,"pos":58270}],"flag":"BLOCK","start":98128,"end":98198,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":500045},"to":{"change":6,"start":58182,"end":58270},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let txn_ = txn.read();"},{"Add":" let channel_ = channel.read();"}],"del_contents":[{"Del":" let txn_ = txn.read().unwrap();\n let channel_ = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":850,"ins":{"up_context":[{"change":6,"pos":59346}],"down_context":[{"change":6,"pos":452}],"flag":"BLOCK","start":98199,"end":98238,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":59346},"to":{"change":6,"start":59346,"end":59393},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" &working_copy,"}],"del_contents":[{"Del":" working_copy.as_ref(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":892,"ins":{"up_context":[{"change":6,"pos":60021}],"down_context":[{"change":6,"pos":29043}],"flag":"BLOCK","start":98239,"end":98270,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":60021},"to":{"change":6,"start":60021,"end":60060},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" &working_copy,"}],"del_contents":[{"Del":" working_copy.as_ref(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":915,"ins":{"up_context":[{"change":6,"pos":48}],"down_context":[{"change":6,"pos":451}],"flag":"BLOCK","start":98271,"end":98320,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":48},"to":{"change":6,"start":60061,"end":60119},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut contents = self.contents.lock();"}],"del_contents":[{"Del":" let mut contents = self.contents.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":1236,"ins":{"up_context":[{"change":6,"pos":61005}],"down_context":[{"change":6,"pos":61091}],"flag":"BLOCK","start":98321,"end":98398,"inode":{"change":6,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":61005},"to":{"change":6,"start":61005,"end":61091},"introduced_by":6}],"inode":{"change":6,"pos":488880}},"ins_contents":[{"Add":" let mut deleted_vertices = self.deleted_vertices.lock();"}],"del_contents":[{"Del":" let mut deleted_vertices = self.deleted_vertices.lock().unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":488880},"path":"libpijul/src/record.rs","line":1248,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":61250},"to":{"change":6,"start":61250,"end":61284},"introduced_by":6}],"inode":{"change":6,"pos":488880}}},"contents":[{"Del":" .unwrap()\n"}]}},{"Edit":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":56974}],"down_context":[{"change":6,"pos":531286}],"flag":"BLOCK","start":98399,"end":98423,"inode":{"change":6,"pos":531056}}},"contents":[{"Add":"use parking_lot::Mutex;"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":7,"ins":{"up_context":[{"change":6,"pos":531377}],"down_context":[{"change":6,"pos":531397}],"flag":"BLOCK","start":98424,"end":98444,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":531377},"to":{"change":6,"start":61521,"end":61550},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, Mutex};\n"}]}},{"Edit":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":154,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":534125}],"down_context":[{"change":6,"pos":22355}],"flag":"BLOCK","start":98445,"end":98597,"inode":{"change":6,"pos":531056}}},"contents":[{"Add":" pub fn arc_txn_begin(&self) -> Result>, SanakirjaError> {"},{"Add":" Ok(ArcTxn(Arc::new(RwLock::new(self.mut_txn_begin()?))))"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1193,"ins":{"up_context":[{"change":6,"pos":46014}],"down_context":[{"change":6,"pos":77276}],"flag":"BLOCK","start":98598,"end":98637,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":46014},"to":{"change":6,"start":62958,"end":63006},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let remote = remote.db.lock();"}],"del_contents":[{"Del":" let remote = remote.db.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1234,"ins":{"up_context":[{"change":6,"pos":549208}],"down_context":[{"change":6,"pos":549276}],"flag":"BLOCK","start":98638,"end":98700,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":549208},"to":{"change":6,"start":63007,"end":63078},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" match self.open_channels.lock().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_channels.lock().unwrap().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1256,"ins":{"up_context":[{"change":6,"pos":27022}],"down_context":[{"change":6,"pos":8251}],"flag":"BLOCK","start":98701,"end":98762,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":27022},"to":{"change":6,"start":63137,"end":63207},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":550434},"to":{"change":6,"start":63137,"end":63207},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" match self.open_remotes.lock().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_remotes.lock().unwrap().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1377,"ins":{"up_context":[{"change":6,"pos":28104}],"down_context":[{"change":6,"pos":9588}],"flag":"BLOCK","start":98763,"end":98824,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":28104},"to":{"change":6,"start":63262,"end":63332},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":555360},"to":{"change":6,"start":63262,"end":63332},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" match self.open_remotes.lock().entry(name.clone()) {"}],"del_contents":[{"Del":" match self.open_remotes.lock().unwrap().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1396,"ins":{"up_context":[{"change":6,"pos":556166}],"down_context":[{"change":6,"pos":556231}],"flag":"BLOCK","start":98825,"end":98882,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":556166},"to":{"change":6,"start":63391,"end":63457},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" Ok(self.open_remotes.lock().get(&name).cloned())"}],"del_contents":[{"Del":" Ok(self.open_remotes.lock().unwrap().get(&name).cloned())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1433,"ins":{"up_context":[{"change":6,"pos":49468}],"down_context":[{"change":6,"pos":82067}],"flag":"BLOCK","start":98883,"end":98957,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49468},"to":{"change":6,"start":63458,"end":63541},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &remote.db.lock().rev, hash, None)? {"}],"del_contents":[{"Del":" match btree::get(&self.txn, &remote.db.lock().unwrap().rev, hash, None)? {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1443,"ins":{"up_context":[{"change":6,"pos":49685}],"down_context":[{"change":6,"pos":82263}],"flag":"BLOCK","start":98958,"end":99032,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":49685},"to":{"change":6,"start":63542,"end":63625},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" match btree::get(&self.txn, &remote.db.lock().states, m, None)? {"}],"del_contents":[{"Del":" match btree::get(&self.txn, &remote.db.lock().unwrap().states, m, None)? {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1733,"ins":{"up_context":[{"change":6,"pos":52526}],"down_context":[{"change":6,"pos":85694}],"flag":"BLOCK","start":99033,"end":99076,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52526},"to":{"change":6,"start":66499,"end":66551},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let mut remote = remote.db.lock();"}],"del_contents":[{"Del":" let mut remote = remote.db.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1751,"ins":{"up_context":[{"change":6,"pos":52661}],"down_context":[{"change":6,"pos":86073}],"flag":"BLOCK","start":99077,"end":99120,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52661},"to":{"change":6,"start":66552,"end":66604},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let mut remote = remote.db.lock();"}],"del_contents":[{"Del":" let mut remote = remote.db.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1776,"ins":{"up_context":[{"change":6,"pos":563283}],"down_context":[{"change":6,"pos":563351}],"flag":"BLOCK","start":99121,"end":99196,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":563283},"to":{"change":6,"start":66605,"end":66689},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let result = match self.open_channels.lock().entry(name.clone()) {"}],"del_contents":[{"Del":" let result = match self.open_channels.lock().unwrap().entry(name.clone()) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1833,"ins":{"up_context":[{"change":6,"pos":52923}],"down_context":[{"change":6,"pos":565315}],"flag":"BLOCK","start":99197,"end":99237,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":52923},"to":{"change":6,"start":66812,"end":66861},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let channel = channel.r.read();"}],"del_contents":[{"Del":" let channel = channel.r.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1868,"ins":{"up_context":[{"change":6,"pos":89660}],"down_context":[{"change":6,"pos":89734}],"flag":"BLOCK","start":99238,"end":99306,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":89660},"to":{"change":6,"start":66917,"end":66994},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" self.open_channels.lock().insert(name, br.clone());"}],"del_contents":[{"Del":" self.open_channels.lock().unwrap().insert(name, br.clone());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1890,"ins":{"up_context":[{"change":6,"pos":90098}],"down_context":[{"change":6,"pos":15970}],"flag":"BLOCK","start":99307,"end":99351,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":90098},"to":{"change":6,"start":66995,"end":67048},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" &channel.r.read().name,"}],"del_contents":[{"Del":" &channel.r.read().unwrap().name,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1897,"ins":{"up_context":[{"change":6,"pos":67081}],"down_context":[{"change":6,"pos":90369}],"flag":"BLOCK","start":99352,"end":99408,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":67081},"to":{"change":6,"start":67081,"end":67180},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" .remove(&channel.r.read().name)"}],"del_contents":[{"Del":" .unwrap()\n .remove(&channel.r.read().unwrap().name)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1900,"ins":{"up_context":[{"change":6,"pos":90423}],"down_context":[{"change":6,"pos":90612}],"flag":"BLOCK","start":99409,"end":99537,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":90423},"to":{"change":6,"start":67181,"end":67245},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":12376},"to":{"change":6,"start":566916,"end":566951},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":67245},"to":{"change":6,"start":566916,"end":566951},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":90559},"to":{"change":6,"start":566916,"end":566951},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":566916},"to":{"change":6,"start":566916,"end":566951},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":566951},"to":{"change":6,"start":67246,"end":67304},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":67304},"to":{"change":6,"start":90560,"end":90612},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":566985},"to":{"change":6,"start":90560,"end":90612},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" channel.r.write().name = name.clone();"},{"Add":" self.open_channels.lock().insert(name, channel.clone());"}],"del_contents":[{"Del":" channel.r.write().unwrap().name = name.clone();\n"},{"Del":" self.open_channels\n"},{"Del":" .lock()\n .unwrap()\n"},{"Del":" .insert(name, channel.clone());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1909,"ins":{"up_context":[{"change":6,"pos":218}],"down_context":[{"change":6,"pos":67401}],"flag":"BLOCK","start":99538,"end":99625,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":218},"to":{"change":6,"start":67305,"end":67401},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let channel = if let Some(channel) = self.open_channels.lock().remove(&name) {"}],"del_contents":[{"Del":" let channel = if let Some(channel) = self.open_channels.lock().unwrap().remove(&name) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1914,"ins":{"up_context":[{"change":6,"pos":3783}],"down_context":[{"change":6,"pos":476}],"flag":"BLOCK","start":99626,"end":99657,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3783},"to":{"change":6,"start":67455,"end":67512},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" .into_inner();"}],"del_contents":[{"Del":" .into_inner()\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1945,"ins":{"up_context":[{"change":6,"pos":190}],"down_context":[{"change":6,"pos":2052}],"flag":"BLOCK","start":99658,"end":99702,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":190},"to":{"change":6,"start":388,"end":441},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":388},"to":{"change":6,"start":388,"end":441},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let chan = chan.read();"}],"del_contents":[{"Del":" let chan = chan.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1994,"ins":{"up_context":[{"change":6,"pos":568188}],"down_context":[{"change":6,"pos":568255}],"flag":"BLOCK","start":99703,"end":99754,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":568188},"to":{"change":6,"start":30319,"end":30379},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" match self.open_remotes.lock().entry(id) {"}],"del_contents":[{"Del":" match self.open_remotes.lock().unwrap().entry(id) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2029,"ins":{"up_context":[{"change":6,"pos":569492}],"down_context":[{"change":6,"pos":31128}],"flag":"BLOCK","start":99755,"end":99818,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":569492},"to":{"change":6,"start":31056,"end":31128},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" Ok(self.open_remotes.lock().get(&id).unwrap().clone())"}],"del_contents":[{"Del":" Ok(self.open_remotes.lock().unwrap().get(&id).unwrap().clone())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2033,"ins":{"up_context":[{"change":6,"pos":31226}],"down_context":[{"change":6,"pos":569765}],"flag":"BLOCK","start":99819,"end":99889,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31226},"to":{"change":6,"start":31226,"end":31247},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":31247},"to":{"change":6,"start":67720,"end":67788},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":67720},"to":{"change":6,"start":67720,"end":67788},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":67788},"to":{"change":6,"start":31248,"end":31303},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let r = self.open_remotes.lock().remove(&remote.id).unwrap();"}],"del_contents":[{"Del":" let r = self\n"},{"Del":" .open_remotes\n .lock()\n .unwrap()\n"},{"Del":" .remove(&remote.id)\n .unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2040,"ins":{"up_context":[{"change":6,"pos":31462}],"down_context":[{"change":6,"pos":68057}],"flag":"BLOCK","start":99890,"end":99954,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":31462},"to":{"change":6,"start":31462,"end":31535},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" if let Some(r) = self.open_remotes.lock().remove(&id) {"}],"del_contents":[{"Del":" if let Some(r) = self.open_remotes.lock().unwrap().remove(&id) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2049,"ins":{"up_context":[{"change":6,"pos":570575}],"down_context":[{"change":6,"pos":570703}],"flag":"BLOCK","start":99955,"end":100081,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":570575},"to":{"change":6,"start":68111,"end":68277},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let open_channels ="},{"Add":" std::mem::replace(self.open_channels.lock().deref_mut(), HashMap::default());"}],"del_contents":[{"Del":" let open_channels = std::mem::replace(\n self.open_channels.lock().unwrap().deref_mut(),\n HashMap::default(),\n );\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2057,"ins":{"up_context":[{"change":6,"pos":570887}],"down_context":[{"change":6,"pos":92228}],"flag":"BLOCK","start":100082,"end":100206,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":570887},"to":{"change":6,"start":68278,"end":68442},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let open_remotes ="},{"Add":" std::mem::replace(self.open_remotes.lock().deref_mut(), HashMap::default());"}],"del_contents":[{"Del":" let open_remotes = std::mem::replace(\n self.open_remotes.lock().unwrap().deref_mut(),\n HashMap::default(),\n );\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2125,"ins":{"up_context":[{"change":6,"pos":183}],"down_context":[{"change":6,"pos":572976}],"flag":"BLOCK","start":100207,"end":100247,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":183},"to":{"change":6,"start":68506,"end":68555},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let channel = channel.r.read();"}],"del_contents":[{"Del":" let channel = channel.r.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2153,"ins":{"up_context":[{"change":6,"pos":16714}],"down_context":[{"change":6,"pos":574853}],"flag":"BLOCK","start":100248,"end":100330,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":574650},"to":{"change":6,"start":574650,"end":574705},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":574705},"to":{"change":6,"start":68556,"end":68664},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":68664},"to":{"change":6,"start":574786,"end":574797},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":574786},"to":{"change":6,"start":574786,"end":574797},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" std::mem::drop(self.open_channels.lock().remove(&channel.r.read().name));"}],"del_contents":[{"Del":" std::mem::drop(\n self.open_channels\n"},{"Del":" .lock()\n .unwrap()\n .remove(&channel.r.read().unwrap().name),\n"},{"Del":" );\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2160,"ins":{"up_context":[{"change":6,"pos":94732}],"down_context":[{"change":6,"pos":32637}],"flag":"BLOCK","start":100331,"end":100365,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":94732},"to":{"change":6,"start":68665,"end":68708},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" let r = remote.db.lock();"}],"del_contents":[{"Del":" let r = remote.db.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2175,"ins":{"up_context":[{"change":6,"pos":53881}],"down_context":[{"change":6,"pos":576000}],"flag":"BLOCK","start":100366,"end":100435,"inode":{"change":6,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":53881},"to":{"change":6,"start":32984,"end":33062},"introduced_by":6}],"inode":{"change":6,"pos":531056}},"ins_contents":[{"Add":" std::mem::drop(self.open_remotes.lock().remove(&remote.id));"}],"del_contents":[{"Del":" std::mem::drop(self.open_remotes.lock().unwrap().remove(&remote.id));\n"}]}},{"Edit":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":4,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":68821}],"down_context":[{"change":6,"pos":586920}],"flag":"BLOCK","start":100436,"end":100470,"inode":{"change":6,"pos":586748}}},"contents":[{"Add":"use parking_lot::{Mutex, RwLock};"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":6,"ins":{"up_context":[{"change":6,"pos":586940}],"down_context":[{"change":6,"pos":586957}],"flag":"BLOCK","start":100471,"end":100491,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":586940},"to":{"change":6,"start":68822,"end":68859},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, Mutex, RwLock};\n"}]}},{"Edit":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":155,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":68903}],"down_context":[{"change":6,"pos":68903}],"flag":"BLOCK","start":100492,"end":100635,"inode":{"change":6,"pos":586748}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"pub struct ArcTxn(pub Arc>);"},{"Add":""},{"Add":"impl Clone for ArcTxn {"},{"Add":" fn clone(&self) -> Self {"},{"Add":" ArcTxn(self.0.clone())"},{"Add":" }"}]}},{"Edit":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":165,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":68906}],"down_context":[{"change":6,"pos":68906}],"flag":"BLOCK","start":100636,"end":101005,"inode":{"change":6,"pos":586748}}},"contents":[{"Add":"impl ArcTxn {"},{"Add":" pub fn commit(self) -> Result<(), T::GraphError> {"},{"Add":" if let Ok(txn) = Arc::try_unwrap(self.0) {"},{"Add":" txn.into_inner().commit()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl std::ops::Deref for ArcTxn {"},{"Add":" type Target = RwLock;"},{"Add":" fn deref(&self) -> &Self::Target {"},{"Add":" &self.0"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":187,"ins":{"up_context":[{"change":6,"pos":69025}],"down_context":[{"change":6,"pos":69163}],"flag":"BLOCK","start":101006,"end":101097,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":69025},"to":{"change":6,"start":69025,"end":69163},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" pub fn read(&self) -> parking_lot::RwLockReadGuard {"},{"Add":" self.r.read()"}],"del_contents":[{"Del":" pub fn read(&self) -> Result, PoisonError> {\n self.r.read().map_err(|_| PoisonError {})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":190,"ins":{"up_context":[{"change":6,"pos":69169}],"down_context":[{"change":6,"pos":69310}],"flag":"BLOCK","start":101098,"end":101192,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":69169},"to":{"change":6,"start":69169,"end":69310},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" pub fn write(&self) -> parking_lot::RwLockWriteGuard {"},{"Add":" self.r.write()"}],"del_contents":[{"Del":" pub fn write(&self) -> Result, PoisonError> {\n self.r.write().map_err(|_| PoisonError {})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":206,"ins":{"up_context":[{"change":6,"pos":588200}],"down_context":[{"change":6,"pos":588311}],"flag":"BLOCK","start":101193,"end":101279,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":588200},"to":{"change":6,"start":69317,"end":69450},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" pub fn lock(&self) -> parking_lot::MutexGuard> {"},{"Add":" self.db.lock()"}],"del_contents":[{"Del":" pub fn lock(&self) -> Result>, PoisonError> {\n self.db.lock().map_err(|_| PoisonError {})\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":210,"ins":{"up_context":[{"change":6,"pos":35105}],"down_context":[{"change":6,"pos":35204}],"flag":"BLOCK","start":101280,"end":101353,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35105},"to":{"change":6,"start":35105,"end":35204},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" pub fn id_revision(&self) -> u64 {"},{"Add":" self.lock().id_rev.into()"}],"del_contents":[{"Del":" pub fn id_revision(&self) -> Result {\n Ok(self.lock()?.id_rev.into())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":214,"ins":{"up_context":[{"change":6,"pos":35211}],"down_context":[{"change":6,"pos":35341}],"flag":"BLOCK","start":101354,"end":101446,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":35211},"to":{"change":6,"start":35211,"end":35341},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" pub fn set_id_revision(&self, rev: u64) -> () {"},{"Add":" self.lock().id_rev = rev.into()"}],"del_contents":[{"Del":" pub fn set_id_revision(&self, rev: u64) -> Result<(), PoisonError> {\n self.lock()?.id_rev = rev.into();\n Ok(())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":997,"ins":{"up_context":[{"change":6,"pos":37089}],"down_context":[{"change":6,"pos":37165}],"flag":"BLOCK","start":101447,"end":101514,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":37089},"to":{"change":6,"start":37089,"end":37165},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" for x in txn.iter_remote(&rem.lock().remote, 0).unwrap() {"}],"del_contents":[{"Del":" for x in txn.iter_remote(&rem.lock().unwrap().remote, 0).unwrap() {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1013,"ins":{"up_context":[{"change":6,"pos":44404}],"down_context":[{"change":6,"pos":69743}],"flag":"BLOCK","start":101515,"end":101551,"inode":{"change":6,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":44404},"to":{"change":6,"start":69698,"end":69743},"introduced_by":6}],"inode":{"change":6,"pos":586748}},"ins_contents":[{"Add":" let channel = channel.r.read();"}],"del_contents":[{"Del":" let channel = channel.r.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":638683},"path":"libpijul/src/pristine/merkle.rs","line":93,"ins":{"up_context":[{"change":6,"pos":112517}],"down_context":[{"change":6,"pos":112573}],"flag":"BLOCK","start":101552,"end":101614,"inode":{"change":6,"pos":638683}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":112517},"to":{"change":6,"start":112517,"end":112573},"introduced_by":6}],"inode":{"change":6,"pos":638683}},"ins_contents":[{"Add":"#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]"}],"del_contents":[{"Del":"#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":14,"ins":{"up_context":[{"change":6,"pos":672334}],"down_context":[{"change":6,"pos":672376}],"flag":"BLOCK","start":101615,"end":101635,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":672334},"to":{"change":6,"start":73464,"end":73494},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":"use std::sync::Arc;"}],"del_contents":[{"Del":"use std::sync::{Arc, RwLock};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":17,"ins":{"up_context":[{"change":6,"pos":672484}],"down_context":[{"change":6,"pos":672501}],"flag":"BLOCK","start":101636,"end":101668,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":672484},"to":{"change":6,"start":672484,"end":672501},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":"#[derive(Debug, PartialEq, Eq)]"}],"del_contents":[{"Del":"#[derive(Debug)]\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":34,"ins":{"up_context":[{"change":6,"pos":73572}],"down_context":[{"change":6,"pos":73616}],"flag":"BLOCK","start":101669,"end":101721,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":73572},"to":{"change":6,"start":73572,"end":73616},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" R: WorkingCopy + Send + Clone + Sync + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":37,"ins":{"up_context":[{"change":6,"pos":73664}],"down_context":[{"change":6,"pos":673107}],"flag":"BLOCK","start":101722,"end":101736,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":73664},"to":{"change":6,"start":73664,"end":73682},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":39,"ins":{"up_context":[{"change":6,"pos":673124}],"down_context":[{"change":6,"pos":673174}],"flag":"BLOCK","start":101737,"end":101787,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":673124},"to":{"change":6,"start":73683,"end":73708},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":73708},"to":{"change":6,"start":73708,"end":73736},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: Arc>,\n"},{"Del":" channel: ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":53,"ins":{"up_context":[{"change":6,"pos":673323}],"down_context":[{"change":6,"pos":673373}],"flag":"BLOCK","start":101788,"end":101834,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":673323},"to":{"change":6,"start":673323,"end":673336},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":673336},"to":{"change":6,"start":73882,"end":73899},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" txn,\n"},{"Del":" channel,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":66,"ins":{"up_context":[{"change":6,"pos":74029}],"down_context":[{"change":6,"pos":74059}],"flag":"BLOCK","start":101835,"end":101873,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":74029},"to":{"change":6,"start":74029,"end":74059},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" R: WorkingCopy + Clone + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":69,"ins":{"up_context":[{"change":6,"pos":74097}],"down_context":[{"change":6,"pos":74115}],"flag":"BLOCK","start":101874,"end":101888,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":74097},"to":{"change":6,"start":74097,"end":74115},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":71,"ins":{"up_context":[{"change":6,"pos":74132}],"down_context":[{"change":6,"pos":74157}],"flag":"BLOCK","start":101889,"end":101909,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":74132},"to":{"change":6,"start":74132,"end":74157},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":119,"ins":{"up_context":[{"change":6,"pos":75621}],"down_context":[{"change":6,"pos":75665}],"flag":"BLOCK","start":101910,"end":101962,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":75621},"to":{"change":6,"start":75621,"end":75665},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"}],"del_contents":[{"Del":" R: WorkingCopy + Send + Sync + 'static,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":123,"ins":{"up_context":[{"change":6,"pos":673660}],"down_context":[{"change":6,"pos":673678}],"flag":"BLOCK","start":101963,"end":101977,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":673660},"to":{"change":6,"start":75711,"end":75729},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" repo: &R,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":125,"ins":{"up_context":[{"change":6,"pos":673695}],"down_context":[{"change":6,"pos":75755}],"flag":"BLOCK","start":101978,"end":101998,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":673695},"to":{"change":6,"start":75730,"end":75755},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":148,"ins":{"up_context":[{"change":6,"pos":76378}],"down_context":[{"change":6,"pos":76451}],"flag":"BLOCK","start":101999,"end":102073,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":76378},"to":{"change":6,"start":76378,"end":76451},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" output_loop(&repo, &changes, txn, channel, work, stop, t + 1)"}],"del_contents":[{"Del":" output_loop(repo, &changes, txn, channel, work, stop, t + 1)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":159,"ins":{"up_context":[{"change":6,"pos":76578}],"down_context":[{"change":6,"pos":76673}],"flag":"BLOCK","start":102074,"end":102151,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":76578},"to":{"change":6,"start":76578,"end":76673},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn_ = txn.read();"},{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let txn_ = txn.read().unwrap();\n let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":166,"ins":{"up_context":[{"change":6,"pos":76841}],"down_context":[{"change":6,"pos":76962}],"flag":"BLOCK","start":102152,"end":102257,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":76841},"to":{"change":6,"start":76841,"end":76962},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut txn = txn.write();"},{"Add":" kill_dead_files::(&mut *txn, &repo, &dead)?;"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n kill_dead_files::(&mut *txn, repo.clone(), &dead)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":172,"ins":{"up_context":[{"change":6,"pos":76979}],"down_context":[{"change":6,"pos":77065}],"flag":"BLOCK","start":102258,"end":102326,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":76979},"to":{"change":6,"start":76979,"end":77065},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":200,"ins":{"up_context":[{"change":6,"pos":77422}],"down_context":[{"change":6,"pos":77524}],"flag":"BLOCK","start":102327,"end":102411,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":77422},"to":{"change":6,"start":77422,"end":77524},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":229,"ins":{"up_context":[{"change":6,"pos":77935}],"down_context":[{"change":6,"pos":119905}],"flag":"BLOCK","start":102412,"end":102454,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":77935},"to":{"change":6,"start":77935,"end":77986},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":268,"ins":{"up_context":[{"change":6,"pos":78062}],"down_context":[{"change":6,"pos":677476}],"flag":"BLOCK","start":102455,"end":102482,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78062},"to":{"change":6,"start":78062,"end":78096},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" &repo,"}],"del_contents":[{"Del":" repo.clone(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":280,"ins":{"up_context":[{"change":6,"pos":78178}],"down_context":[{"change":6,"pos":78297}],"flag":"BLOCK","start":102483,"end":102584,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78178},"to":{"change":6,"start":78178,"end":78297},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn_ = txn.read();"},{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let txn_ = txn.read().unwrap();\n let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":286,"ins":{"up_context":[{"change":6,"pos":78464}],"down_context":[{"change":6,"pos":78609}],"flag":"BLOCK","start":102585,"end":102714,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78464},"to":{"change":6,"start":78464,"end":78609},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut txn = txn.write();"},{"Add":" kill_dead_files::(&mut *txn, &repo, &dead)?;"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n kill_dead_files::(&mut *txn, repo.clone(), &dead)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":296,"ins":{"up_context":[{"change":6,"pos":78654}],"down_context":[{"change":6,"pos":78772}],"flag":"BLOCK","start":102715,"end":102815,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":78654},"to":{"change":6,"start":78654,"end":78772},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":314,"ins":{"up_context":[{"change":6,"pos":678511}],"down_context":[{"change":6,"pos":882}],"flag":"BLOCK","start":102816,"end":102886,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":678511},"to":{"change":6,"start":79406,"end":79485},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" if needs_output(repo, if_modified_after, &path) {"}],"del_contents":[{"Del":" if needs_output(repo.as_ref(), if_modified_after, &path) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":330,"ins":{"up_context":[{"change":6,"pos":79625}],"down_context":[{"change":6,"pos":79694}],"flag":"BLOCK","start":102887,"end":102956,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":79625},"to":{"change":6,"start":968,"end":1045},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let o = output_loop(repo, changes, txn, channel, work, stop, 0);"}],"del_contents":[{"Del":" let o = output_loop(repo.clone(), changes, txn, channel, work, stop, 0);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":367,"ins":{"up_context":[{"change":6,"pos":82892}],"down_context":[{"change":6,"pos":679767}],"flag":"BLOCK","start":102957,"end":102991,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":82892},"to":{"change":6,"start":79754,"end":79797},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" txn: ArcTxn,"},{"Add":" repo: &R,"}],"del_contents":[{"Del":" txn: Arc>,\n repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":387,"ins":{"up_context":[{"change":6,"pos":680369}],"down_context":[{"change":6,"pos":79838}],"flag":"BLOCK","start":102992,"end":103023,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":680369},"to":{"change":6,"start":79798,"end":79838},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn_ = txn.read();"}],"del_contents":[{"Del":" let txn_ = txn.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":392,"ins":{"up_context":[{"change":6,"pos":79950}],"down_context":[{"change":6,"pos":80003}],"flag":"BLOCK","start":103024,"end":103068,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":79950},"to":{"change":6,"start":79950,"end":80003},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"}],"del_contents":[{"Del":" let mut txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":428,"ins":{"up_context":[{"change":6,"pos":80478}],"down_context":[{"change":6,"pos":80527}],"flag":"BLOCK","start":103069,"end":103109,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":80478},"to":{"change":6,"start":80478,"end":80527},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"}],"del_contents":[{"Del":" let mut txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":438,"ins":{"up_context":[{"change":6,"pos":682397}],"down_context":[{"change":6,"pos":80848}],"flag":"BLOCK","start":103110,"end":103146,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":682397},"to":{"change":6,"start":80803,"end":80848},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut txn_ = txn.write();"}],"del_contents":[{"Del":" let mut txn_ = txn.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":462,"ins":{"up_context":[{"change":6,"pos":81341}],"down_context":[{"change":6,"pos":81366}],"flag":"BLOCK","start":103147,"end":103167,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81341},"to":{"change":6,"start":81341,"end":81366},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" txn: ArcTxn,"}],"del_contents":[{"Del":" txn: Arc>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":472,"ins":{"up_context":[{"change":6,"pos":81432}],"down_context":[{"change":6,"pos":81518}],"flag":"BLOCK","start":103168,"end":103236,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81432},"to":{"change":6,"start":81432,"end":81518},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let txn = txn.read().unwrap();\n let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":476,"ins":{"up_context":[{"change":6,"pos":81670}],"down_context":[{"change":6,"pos":81760}],"flag":"BLOCK","start":103237,"end":103315,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81670},"to":{"change":6,"start":81670,"end":81760},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut f = vertex_buffer::ConflictsWriter::new(w, &path, conflicts);"}],"del_contents":[{"Del":" let mut f = vertex_buffer::ConflictsWriter::new(w, &output_item.path, conflicts);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":483,"ins":{"up_context":[{"change":6,"pos":81958}],"down_context":[{"change":6,"pos":683460}],"flag":"BLOCK","start":103316,"end":103386,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":81958},"to":{"change":6,"start":81958,"end":82046},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" let mut txn = txn.write();"},{"Add":" let mut channel = channel.write();"}],"del_contents":[{"Del":" let mut txn = txn.write().unwrap();\n let mut channel = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":545,"ins":{"up_context":[{"change":6,"pos":22808}],"down_context":[{"change":6,"pos":685451}],"flag":"BLOCK","start":103387,"end":103463,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":22808},"to":{"change":6,"start":84973,"end":85041},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":"fn kill_dead_files("}],"del_contents":[{"Del":"fn kill_dead_files(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":671807},"path":"libpijul/src/output/output.rs","line":547,"ins":{"up_context":[{"change":6,"pos":685468}],"down_context":[{"change":6,"pos":685486}],"flag":"BLOCK","start":103464,"end":103478,"inode":{"change":6,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":685468},"to":{"change":6,"start":82336,"end":82354},"introduced_by":6}],"inode":{"change":6,"pos":671807}},"ins_contents":[{"Add":" repo: &W,"}],"del_contents":[{"Del":" repo: Arc,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":690044},"path":"libpijul/src/output/archive.rs","line":146,"ins":{"up_context":[{"change":6,"pos":88013}],"down_context":[{"change":6,"pos":692439}],"flag":"BLOCK","start":103479,"end":103513,"inode":{"change":6,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":88013},"to":{"change":6,"start":83121,"end":83164},"introduced_by":6}],"inode":{"change":6,"pos":690044}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":64,"ins":{"up_context":[{"change":6,"pos":720137}],"down_context":[{"change":6,"pos":27689}],"flag":"BLOCK","start":103514,"end":103585,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":720137},"to":{"change":6,"start":27636,"end":27689},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":"pub use crate::apply::{apply_change_arc, ApplyError, LocalApplyError};"}],"del_contents":[{"Del":"pub use crate::apply::{ApplyError, LocalApplyError};\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":68,"ins":{"up_context":[{"change":6,"pos":60252}],"down_context":[{"change":6,"pos":60358}],"flag":"BLOCK","start":103586,"end":103771,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":60252},"to":{"change":6,"start":27640,"end":27817},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" ArcTxn, Base32, ChangeId, ChannelMutTxnT, ChannelRef, ChannelTxnT, DepsTxnT, EdgeFlags,"},{"Add":" GraphTxnT, Hash, Inode, Merkle, MutTxnT, OwnedPathId, RemoteRef, TreeTxnT, TxnT, Vertex,"}],"del_contents":[{"Del":" Base32, ChangeId, ChannelMutTxnT, ChannelRef, ChannelTxnT, DepsTxnT, EdgeFlags, GraphTxnT,\n Hash, Inode, Merkle, MutTxnT, OwnedPathId, RemoteRef, TreeTxnT, TxnT, Vertex,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":221,"ins":{"up_context":[{"change":6,"pos":724271}],"down_context":[{"change":6,"pos":724318}],"flag":"BLOCK","start":103772,"end":103830,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":724271},"to":{"change":6,"start":84339,"end":84406},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" hasher.update(&recorded.contents.lock()[..]);"}],"del_contents":[{"Del":" hasher.update(&recorded.contents.lock().unwrap()[..]);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":242,"ins":{"up_context":[{"change":6,"pos":84501}],"down_context":[{"change":6,"pos":725011}],"flag":"BLOCK","start":103831,"end":103862,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":84501},"to":{"change":6,"start":84501,"end":84558},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" .into_inner(),"}],"del_contents":[{"Del":" .into_inner()\n .unwrap(),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":366,"ins":{"up_context":[{"change":6,"pos":728883}],"down_context":[{"change":6,"pos":126344}],"flag":"BLOCK","start":103863,"end":103939,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":728883},"to":{"change":6,"start":84624,"end":84709},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" for x in pristine::changeid_rev_log(self, &channel.read(), None)? {"}],"del_contents":[{"Del":" for x in pristine::changeid_rev_log(self, &channel.read().unwrap(), None)? {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":383,"ins":{"up_context":[{"change":6,"pos":5972}],"down_context":[{"change":6,"pos":6033}],"flag":"BLOCK","start":103940,"end":103992,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5972},"to":{"change":6,"start":5972,"end":6033},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" let mut channel_ = channel.write();"}],"del_contents":[{"Del":" let mut channel_ = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":414,"ins":{"up_context":[{"change":6,"pos":126860}],"down_context":[{"change":6,"pos":96217}],"flag":"BLOCK","start":103993,"end":104060,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126860},"to":{"change":6,"start":84710,"end":84786},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" self.get_changeset(self.changes(&channel.read()), cid)"}],"del_contents":[{"Del":" self.get_changeset(self.changes(&channel.read().unwrap()), cid)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":499,"ins":{"up_context":[{"change":6,"pos":127399}],"down_context":[{"change":6,"pos":97762}],"flag":"BLOCK","start":104061,"end":104153,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127399},"to":{"change":6,"start":127399,"end":127430},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127430},"to":{"change":6,"start":84787,"end":84847},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":84847},"to":{"change":6,"start":127483,"end":127540},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127483},"to":{"change":6,"start":127483,"end":127540},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" .get_revchangeset(self.rev_changes(&channel.read()), &pristine::L64(n.to_le()))"}],"del_contents":[{"Del":" .get_revchangeset(\n"},{"Del":" self.rev_changes(&channel.read().unwrap()),\n"},{"Del":" &pristine::L64(n.to_le()),\n )\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":520,"ins":{"up_context":[{"change":6,"pos":127881}],"down_context":[{"change":6,"pos":98065}],"flag":"BLOCK","start":104154,"end":104219,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":127881},"to":{"change":6,"start":84848,"end":84922},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" self.get_changeset(self.changes(&channel.read()), h)"}],"del_contents":[{"Del":" self.get_changeset(self.changes(&channel.read().unwrap()), h)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":550,"ins":{"up_context":[{"change":6,"pos":732181}],"down_context":[{"change":6,"pos":732254}],"flag":"BLOCK","start":104220,"end":104291,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":732181},"to":{"change":6,"start":84923,"end":85003},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" fs::find_path(changes, self, &channel.read(), false, position)"}],"del_contents":[{"Del":" fs::find_path(changes, self, &channel.read().unwrap(), false, position)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":563,"ins":{"up_context":[{"change":6,"pos":732653}],"down_context":[{"change":6,"pos":732725}],"flag":"BLOCK","start":104292,"end":104362,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":732653},"to":{"change":6,"start":85004,"end":85083},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" fs::find_path(changes, self, &channel.read(), true, position)"}],"del_contents":[{"Del":" fs::find_path(changes, self, &channel.read().unwrap(), true, position)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":575,"ins":{"up_context":[{"change":6,"pos":98933}],"down_context":[{"change":6,"pos":733552}],"flag":"BLOCK","start":104363,"end":104432,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":98933},"to":{"change":6,"start":85084,"end":85162},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" fs::follow_oldest_path(changes, self, &channel.read(), path)"}],"del_contents":[{"Del":" fs::follow_oldest_path(changes, self, &channel.read().unwrap(), path)\n"}]}},{"Replacement":{"inode":{"change":6,"pos":5013},"path":"libpijul/src/key.rs","line":61,"ins":{"up_context":[{"change":6,"pos":6610}],"down_context":[{"change":6,"pos":6648}],"flag":"BLOCK","start":104433,"end":104477,"inode":{"change":6,"pos":5013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6610},"to":{"change":6,"start":6610,"end":6648},"introduced_by":6}],"inode":{"change":6,"pos":5013}},"ins_contents":[{"Add":" let sk = SKey::generate(Some(expires));"}],"del_contents":[{"Del":" let sk = SKey::generate(expires);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":5013},"path":"libpijul/src/key.rs","line":286,"ins":{"up_context":[{"change":6,"pos":14438}],"down_context":[{"change":6,"pos":14476}],"flag":"BLOCK","start":104478,"end":104522,"inode":{"change":6,"pos":5013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":14438},"to":{"change":6,"start":14438,"end":14476},"introduced_by":6}],"inode":{"change":6,"pos":5013}},"ins_contents":[{"Add":" let sk = SKey::generate(Some(expires));"}],"del_contents":[{"Del":" let sk = SKey::generate(expires);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":737429},"path":"libpijul/src/fs.rs","line":915,"ins":{"up_context":[{"change":3,"pos":1}],"down_context":[{"change":3,"pos":101}],"flag":"BLOCK","start":104523,"end":104579,"inode":{"change":6,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1},"to":{"change":3,"start":1,"end":101},"introduced_by":3}],"inode":{"change":6,"pos":737429}},"ins_contents":[{"Add":" let FileMetadata { basename, .. } = changes"}],"del_contents":[{"Del":" let FileMetadata {\n basename,\n ..\n } = changes\n"}]}},{"Replacement":{"inode":{"change":6,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":45,"ins":{"up_context":[{"change":6,"pos":85846}],"down_context":[{"change":6,"pos":85903}],"flag":"BLOCK","start":104580,"end":104628,"inode":{"change":6,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":85846},"to":{"change":6,"start":85846,"end":85903},"introduced_by":6}],"inode":{"change":6,"pos":779907}},"ins_contents":[{"Add":" let start = self.contents.lock().len();"}],"del_contents":[{"Del":" let start = self.contents.lock().unwrap().len();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":63,"ins":{"up_context":[{"change":6,"pos":142}],"down_context":[{"change":6,"pos":781630}],"flag":"BLOCK","start":104629,"end":104678,"inode":{"change":6,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":142},"to":{"change":6,"start":85925,"end":85983},"introduced_by":6}],"inode":{"change":6,"pos":779907}},"ins_contents":[{"Add":" let mut contents = self.contents.lock();"}],"del_contents":[{"Del":" let mut contents = self.contents.lock().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":239,"ins":{"up_context":[{"change":6,"pos":87052}],"down_context":[{"change":6,"pos":87110}],"flag":"BLOCK","start":104679,"end":104728,"inode":{"change":6,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":87052},"to":{"change":6,"start":87052,"end":87110},"introduced_by":6}],"inode":{"change":6,"pos":805350}},"ins_contents":[{"Add":" let mut contents = self.contents.lock();"}],"del_contents":[{"Del":" let mut contents = self.contents.lock().unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":12027},"path":"libpijul/src/chardetng/mod.rs","line":3155,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":138044},"to":{"change":6,"start":138044,"end":138809},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":138809},"to":{"change":6,"start":138809,"end":138851},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":138851},"to":{"change":6,"start":138851,"end":139556},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":139556},"to":{"change":6,"start":139556,"end":139598},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":139598},"to":{"change":6,"start":139598,"end":139873},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":139873},"to":{"change":6,"start":139873,"end":139915},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":139915},"to":{"change":6,"start":139915,"end":140162},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140162},"to":{"change":6,"start":140162,"end":140204},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140204},"to":{"change":6,"start":140204,"end":140493},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140493},"to":{"change":6,"start":140493,"end":140535},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140535},"to":{"change":6,"start":140535,"end":140780},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140780},"to":{"change":6,"start":140780,"end":140822},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":140822},"to":{"change":6,"start":140822,"end":141078},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":141078},"to":{"change":6,"start":141078,"end":141120},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":141120},"to":{"change":6,"start":141120,"end":141297},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":141297},"to":{"change":6,"start":141297,"end":141339},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":141339},"to":{"change":6,"start":141339,"end":143335},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":143335},"to":{"change":6,"start":1619,"end":1689},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1689},"to":{"change":2,"start":278,"end":344},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":344},"to":{"change":6,"start":143335,"end":154466},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":6,"pos":1750},"to":{"change":6,"start":143335,"end":154466},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":143335},"to":{"change":6,"start":143335,"end":154466},"introduced_by":6}],"inode":{"change":6,"pos":12027}}},"contents":[{"Del":"\n#[cfg(test)]\nmod tests {\n use super::*;\n use detone::IterDecomposeVietnamese;\n use encoding_rs::IBM866;\n use encoding_rs::ISO_8859_2;\n use encoding_rs::ISO_8859_4;\n use encoding_rs::ISO_8859_5;\n use encoding_rs::ISO_8859_6;\n use encoding_rs::ISO_8859_7;\n use encoding_rs::KOI8_U;\n use encoding_rs::WINDOWS_1250;\n use encoding_rs::WINDOWS_1251;\n use encoding_rs::WINDOWS_1252;\n use encoding_rs::WINDOWS_1253;\n use encoding_rs::WINDOWS_1254;\n use encoding_rs::WINDOWS_1256;\n use encoding_rs::WINDOWS_1257;\n use encoding_rs::WINDOWS_1258;\n use encoding_rs::WINDOWS_874;\n\n fn check_bytes(bytes: &[u8], encoding: &'static Encoding) {\n let mut det = EncodingDetector::new();\n det.feed(bytes, true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" let (decoded, _) = enc.decode_without_bom_handling(bytes);\n println!(\"{:?}\", decoded);\n assert_eq!(enc, encoding);\n }\n\n fn check(input: &str, encoding: &'static Encoding) {\n let orthographic;\n let (bytes, _, _) = if encoding == WINDOWS_1258 {\n orthographic = input\n .chars()\n .decompose_vietnamese_tones(true)\n .collect::();\n encoding.encode(&orthographic)\n } else {\n encoding.encode(input)\n };\n check_bytes(&bytes, encoding);\n }\n\n #[test]\n fn test_i_apostrophe() {\n let mut det = EncodingDetector::new();\n det.feed(b\"I\\x92\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n }\n\n #[test]\n fn test_streaming_numero_one_by_one() {\n let mut det = EncodingDetector::new();\n det.feed(b\"n\", false);\n det.feed(b\".\", false);\n det.feed(b\"\\xBA\", false);\n det.feed(b\"1\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n }\n\n #[test]\n fn test_streaming_numero_two_together() {\n let mut det = EncodingDetector::new();\n det.feed(b\"n.\", false);\n det.feed(b\"\\xBA\", false);\n det.feed(b\"1\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n }\n\n #[test]\n fn test_streaming_numero_one_by_one_extra_before() {\n let mut det = EncodingDetector::new();\n det.feed(b\" n\", false);\n det.feed(b\".\", false);\n det.feed(b\"\\xBA\", false);\n det.feed(b\"1\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n }\n\n #[test]\n fn test_streaming_numero_one_before() {\n let mut det = EncodingDetector::new();\n det.feed(b\"n\", false);\n det.feed(b\".\\xBA\", false);\n det.feed(b\"1\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n }\n\n #[test]\n fn test_streaming_numero_longer_first_buffer() {\n let mut det = EncodingDetector::new();\n det.feed(b\"rrn.\", false);\n det.feed(b\"\\xBA\", false);\n det.feed(b\"1\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n }\n\n #[test]\n fn test_empty() {\n let mut det = EncodingDetector::new();\n let seen_non_ascii = det.feed(b\"\", true);\n"},{"Del":" let enc = det.guess(None, false);\n"},{"Del":" assert_eq!(enc, WINDOWS_1252);\n assert!(!seen_non_ascii);\n }\n\n #[test]\n fn test_fi() {\n check(\"Ääni\", WINDOWS_1252);\n }\n\n #[test]\n fn test_fi_bis() {\n check(\"Tämä\", WINDOWS_1252);\n }\n\n #[test]\n fn test_pt() {\n check(\n \"Este é um teste de codificação de caracteres.\",\n WINDOWS_1252,\n );\n }\n\n #[test]\n fn test_is() {\n check(\"Þetta er kóðunarpróf á staf. Fyrir sum tungumál sem nota latneska stafi þurfum við meira inntak til að taka ákvörðunina.\", WINDOWS_1252);\n }\n\n #[test]\n fn test_ru_short() {\n check(\"Русский\", WINDOWS_1251);\n }\n\n #[test]\n fn test_ru() {\n check(\"Это тест кодировки символов.\", WINDOWS_1251);\n }\n\n #[test]\n fn test_ru_iso() {\n check(\"Это тест кодировки символов.\", ISO_8859_5);\n }\n\n #[test]\n fn test_ru_ibm() {\n check(\"Это тест кодировки символов.\", IBM866);\n }\n\n #[test]\n fn test_ru_koi() {\n check(\"Это тест кодировки символов.\", KOI8_U);\n }\n\n #[test]\n fn test_uk() {\n check(\"Це тест на кодування символів.\", WINDOWS_1251);\n }\n\n #[test]\n fn test_uk_koi() {\n check(\"Це тест на кодування символів.\", KOI8_U);\n }\n\n #[test]\n fn test_el_short() {\n check(\"Ελληνικά\", WINDOWS_1253);\n }\n\n #[test]\n fn test_el() {\n check(\n \"Πρόκειται για δοκιμή κωδικοποίησης χαρακτήρων: Άρης\",\n WINDOWS_1253,\n );\n }\n\n #[test]\n fn test_el_iso() {\n check(\n \"Πρόκειται για δοκιμή κωδικοποίησης χαρακτήρων: Άρης\",\n ISO_8859_7,\n );\n }\n\n #[test]\n fn test_de() {\n check(\"Straße\", WINDOWS_1252);\n"},{"Del":" }\n\n #[test]\n fn test_en_windows1252() {\n // \"Don't \"\n"},{"Del":" check_bytes(&[68, 111, 110, 180, 116, 32], WINDOWS_1252);\n"},{"Del":" }\n\n #[test]\n fn test_he() {\n check(\"\\u{5E2}\\u{5D1}\\u{5E8}\\u{5D9}\\u{5EA}\", WINDOWS_1255);\n }\n\n #[test]\n fn test_2022() {\n check(\"日本語\", ISO_2022_JP);\n }\n\n #[test]\n fn test_th() {\n check(\"นี่คือการทดสอบการเข้ารหัสอักขระ\", WINDOWS_874);\n }\n\n #[test]\n fn test_vi() {\n check(\"Đây là một thử nghiệm mã hóa ký tự.\", WINDOWS_1258);\n }\n\n #[test]\n fn test_tr() {\n check(\"Bu bir karakter kodlama testidir. Latince karakterleri kullanan bazı dillerde karar vermek için daha fazla girdiye ihtiyacımız var.\", WINDOWS_1254);\n }\n\n #[test]\n fn test_simplified() {\n check(\"这是一个字符编码测试。\", GBK);\n }\n\n #[test]\n fn test_traditional() {\n check(\"這是一個字符編碼測試。\", BIG5);\n }\n\n #[test]\n fn test_ko() {\n check(\"이것은 문자 인코딩 테스트입니다.\", EUC_KR);\n }\n\n #[test]\n fn test_shift() {\n check(\"これは文字実験です。\", SHIFT_JIS);\n }\n\n #[test]\n fn test_euc() {\n check(\"これは文字実験です。\", EUC_JP);\n }\n\n #[test]\n fn test_ar() {\n check(\"هذا هو اختبار ترميز الأحرف.\", WINDOWS_1256);\n }\n\n #[test]\n fn test_ar_iso() {\n check(\"هذا هو اختبار ترميز الأحرف.\", ISO_8859_6);\n }\n\n #[test]\n fn test_fa() {\n check(\"این یک تست رمزگذاری کاراکتر است.\", WINDOWS_1256);\n }\n\n #[test]\n fn test_visual() {\n check(\".םיוות דודיק ןחבמ והז\", ISO_8859_8);\n }\n\n #[test]\n fn test_yi() {\n check(\"דאָס איז אַ טעסט פֿאַר קאָדירונג פון כאַראַקטער.\", WINDOWS_1255);\n }\n\n #[test]\n fn test_it() {\n check(\"è\", WINDOWS_1252);\n }\n\n #[test]\n fn test_en() {\n check(\"isn’t\", WINDOWS_1252);\n }\n\n #[test]\n fn test_en_bis() {\n check(\"Rock ’n Roll\", WINDOWS_1252);\n }\n\n #[test]\n fn test_ca() {\n check(\"Codificació de caràcters\", WINDOWS_1252);\n }\n\n #[test]\n fn test_et() {\n check(\"või\", WINDOWS_1252);\n }\n\n #[test]\n fn test_pl_iso() {\n check(\"To jest test kodowania znaków. W przypadku niektórych języków, które używają znaków łacińskich, potrzebujemy więcej danych, aby podjąć decyzję.\", ISO_8859_2);\n }\n\n #[test]\n fn test_pl() {\n check(\"To jest test kodowania znaków. W przypadku niektórych języków, które używają znaków łacińskich, potrzebujemy więcej danych, aby podjąć decyzję.\", WINDOWS_1250);\n }\n\n #[test]\n fn test_lt() {\n check(\"Tai simbolių kodavimo testas. Kai kurioms kalboms, naudojančioms lotyniškus rašmenis, mums reikia daugiau informacijos, kad galėtume priimti sprendimą.\", WINDOWS_1257);\n }\n\n // TODO: Detected as ISO-8859-2.\n // #[test]\n // fn test_lt_windows_iso_8859_4() {\n // check(\"Tai simbolių kodavimo testas. Kai kurioms kalboms, naudojančioms lotyniškus rašmenis, mums reikia daugiau informacijos, kad galėtume priimti sprendimą.\", ISO_8859_4);\n // }\n\n #[test]\n fn test_lv() {\n check(\"Šis ir rakstzīmju kodēšanas tests. Dažās valodās, kurās tiek izmantotas latīņu valodas burti, lēmuma pieņemšanai mums ir nepieciešams vairāk ieguldījuma.\", WINDOWS_1257);\n }\n\n #[test]\n fn test_lv_iso_8859_4() {\n check(\"Šis ir rakstzīmju kodēšanas tests. Dažās valodās, kurās tiek izmantotas latīņu valodas burti, lēmuma pieņemšanai mums ir nepieciešams vairāk ieguldījuma.\", ISO_8859_4);\n }\n\n #[test]\n fn test_a0() {\n // Test that this isn't IBM866. TODO: What about GBK with fully paired 0xA0?\n check(\"\\u{A0}\\u{A0} \\u{A0}\", WINDOWS_1252);\n }\n\n #[test]\n fn test_a0a0() {\n // Test that this isn't GBK or EUC-KR.\n check(\"\\u{A0}\\u{A0}\", WINDOWS_1252);\n }\n\n #[test]\n fn test_space_masculine_space() {\n check(\" º \", WINDOWS_1252);\n }\n\n #[test]\n fn test_space_feminine_space() {\n check(\" ª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_period_masculine_space() {\n check(\".º \", WINDOWS_1252);\n }\n\n #[test]\n fn test_period_feminine_space() {\n check(\".ª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_maria() {\n check(\" Mª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_dona() {\n check(\" Dª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_nuestra() {\n check(\" Nª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_senora() {\n check(\" Sª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_digit_feminine() {\n check(\" 42ª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_digit_masculine() {\n check(\" 42º \", WINDOWS_1252);\n }\n\n #[test]\n fn test_roman_feminine() {\n check(\" XIVª \", WINDOWS_1252);\n }\n\n #[test]\n fn test_roman_masculine() {\n check(\" XIVº \", WINDOWS_1252);\n }\n\n #[test]\n fn test_numero_uno() {\n check(\"Nº1\", WINDOWS_1252);\n }\n\n #[test]\n fn test_numero() {\n check(\"Nº\", WINDOWS_1252);\n }\n\n #[test]\n fn test_euro() {\n check(\" €9\", WINDOWS_1252);\n }\n\n #[test]\n fn test_shift_jis_half_width_katakana() {\n check(\"ﾊｰﾄﾞｳｪｱﾊｰﾄﾞｳｪｱﾊｰﾄﾞｳｪｱﾊｰﾄﾞｳｪｱﾊｰﾄﾞｳｪｱ\", SHIFT_JIS);\n }\n\n #[test]\n fn test_big5_pua() {\n let mut v = Vec::new();\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xA4\\x40\");\n }\n v.extend_from_slice(b\"\\x81\\x40\\xA4\\x40\");\n check_bytes(&v, BIG5);\n }\n\n #[test]\n fn test_big5_single_byte_a0() {\n let mut v = Vec::new();\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xA4\\x40\");\n }\n v.extend_from_slice(b\"\\x81\\x40\\xA0 \");\n check_bytes(&v, BIG5);\n }\n\n #[test]\n fn test_big5_single_byte_ff() {\n let mut v = Vec::new();\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xA4\\x40\");\n }\n v.extend_from_slice(b\"\\x81\\x40\\xFF \");\n check_bytes(&v, BIG5);\n }\n\n #[test]\n fn test_not_big5() {\n let mut v = Vec::new();\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xA4\\x40\");\n }\n v.extend_from_slice(b\"\\x81\\x40\\xA0\\xA0\");\n check_bytes(&v, IBM866);\n }\n\n #[test]\n fn test_euc_kr_pua() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xC9\\xA1\\xB0\\xA1 \");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xC5\\xD7\\xBD\\xBA\\xC6\\xAE. \");\n }\n check_bytes(&v, EUC_KR);\n }\n\n #[test]\n fn test_euc_kr_pua_bis() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xFE\\xA1\\xB0\\xA1 \");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xC5\\xD7\\xBD\\xBA\\xC6\\xAE. \");\n }\n check_bytes(&v, EUC_KR);\n }\n\n #[test]\n fn test_euc_kr_single_byte_ff() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xFF \");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xC5\\xD7\\xBD\\xBA\\xC6\\xAE. \");\n }\n check_bytes(&v, EUC_KR);\n }\n\n #[test]\n fn test_euc_kr_single_byte_81() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x81 \");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xC5\\xD7\\xBD\\xBA\\xC6\\xAE. \");\n }\n check_bytes(&v, EUC_KR);\n }\n\n #[test]\n fn test_euc_kr_single_byte_84() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x84 \");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xC5\\xD7\\xBD\\xBA\\xC6\\xAE. \");\n }\n check_bytes(&v, EUC_KR);\n }\n\n #[test]\n fn test_not_euc_kr() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xC9\\xA0\\xB0\\xA1 \");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\xC5\\xD7\\xBD\\xBA\\xC6\\xAE. \");\n }\n check_bytes(&v, GBK);\n }\n\n #[test]\n fn test_shift_jis_x0213() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x87\\xE5\");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\x82\\xC9\\x82\\xD9\\x82\\xF1\\x82\\xB2\");\n }\n check_bytes(&v, SHIFT_JIS);\n }\n\n #[test]\n fn test_shift_jis_single_byte_fd() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xFD\");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\x82\\xC9\\x82\\xD9\\x82\\xF1\\x82\\xB2\");\n }\n check_bytes(&v, SHIFT_JIS);\n }\n\n #[test]\n fn test_not_shift_jis() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x84\\xE0\");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\x82\\xC9\\x82\\xD9\\x82\\xF1\\x82\\xB2\");\n }\n check_bytes(&v, GBK);\n }\n\n #[test]\n fn test_not_shift_jis_bis() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x87\\x7D\");\n for _ in 0..40 {\n v.extend_from_slice(b\"\\x82\\xC9\\x82\\xD9\\x82\\xF1\\x82\\xB2\");\n }\n check_bytes(&v, GBK);\n }\n\n #[test]\n fn test_euc_jp_x0213() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xAD\\xBF\");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xA4\\xCB\\xA4\\xDB\\xA4\\xF3\\xA4\\xB4\");\n }\n check_bytes(&v, EUC_JP);\n }\n\n #[test]\n fn test_euc_jp_x0213_other_plane() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x8F\\xFE\\xF6\");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xA4\\xCB\\xA4\\xDB\\xA4\\xF3\\xA4\\xB4\");\n }\n check_bytes(&v, EUC_JP);\n }\n\n #[test]\n fn test_not_euc_jp() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\x8F\\xFE\\xF7\");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xA4\\xCB\\xA4\\xDB\\xA4\\xF3\\xA4\\xB4\");\n }\n check_bytes(&v, WINDOWS_1252);\n }\n\n #[test]\n fn test_not_euc_jp_bis() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xA8\\xDF\");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xA4\\xCB\\xA4\\xDB\\xA4\\xF3\\xA4\\xB4\");\n }\n check_bytes(&v, BIG5);\n }\n\n #[test]\n fn test_gbk_single_byte_ff() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xFF\");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xB5\\xC4\");\n }\n check_bytes(&v, GBK);\n }\n\n #[test]\n fn test_gbk_single_byte_a0() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xA0 \");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xB5\\xC4\");\n }\n check_bytes(&v, GBK);\n }\n\n #[test]\n fn test_gbk_single_byte_fe() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xFE \");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xB5\\xC4\");\n }\n check_bytes(&v, GBK);\n }\n\n #[test]\n fn test_not_gbk_single_byte_fc() {\n let mut v = Vec::new();\n v.extend_from_slice(b\"\\xFC \");\n for _ in 0..80 {\n v.extend_from_slice(b\"\\xB5\\xC4\");\n }\n check_bytes(&v, ISO_8859_5);\n }\n}\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":4,"ins":{"up_context":[{"change":6,"pos":824179}],"down_context":[{"change":6,"pos":824179}],"flag":"BLOCK","start":104729,"end":104753,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":824179},"to":{"change":6,"start":87404,"end":87438},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":"use parking_lot::Mutex;"}],"del_contents":[{"Del":"use std::cell::{RefCell, RefMut};\n"}]}},{"Edit":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":6,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":824211}],"down_context":[{"change":6,"pos":824252}],"flag":"BLOCK","start":104754,"end":104774,"inode":{"change":6,"pos":824013}}},"contents":[{"Add":"use std::sync::Arc;"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":12,"ins":{"up_context":[{"change":6,"pos":87463}],"down_context":[{"change":6,"pos":824493}],"flag":"BLOCK","start":104775,"end":104857,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":87463},"to":{"change":6,"start":87463,"end":87542},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" change_cache: Arc>>>,"}],"del_contents":[{"Del":" change_cache: RefCell>>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":20,"ins":{"up_context":[{"change":6,"pos":87676}],"down_context":[{"change":6,"pos":87761}],"flag":"BLOCK","start":104858,"end":104951,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":87676},"to":{"change":6,"start":87676,"end":87761},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" change_cache: Arc::new(Mutex::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE))),"}],"del_contents":[{"Del":" change_cache: RefCell::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE)),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":75,"ins":{"up_context":[{"change":6,"pos":825791}],"down_context":[{"change":6,"pos":87935}],"flag":"BLOCK","start":104952,"end":105045,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":825791},"to":{"change":6,"start":87850,"end":87935},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" change_cache: Arc::new(Mutex::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE))),"}],"del_contents":[{"Del":" change_cache: RefCell::new(lru_cache::LruCache::new(CHANGE_CACHE_SIZE)),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":84,"ins":{"up_context":[{"change":6,"pos":826014}],"down_context":[{"change":6,"pos":35450}],"flag":"BLOCK","start":105046,"end":105186,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":826014},"to":{"change":6,"start":87946,"end":88014},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" parking_lot::MutexGuard<"},{"Add":" lru_cache::LruCache>,"},{"Add":" >,"}],"del_contents":[{"Del":" RefMut>>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":89,"ins":{"up_context":[{"change":6,"pos":826129}],"down_context":[{"change":6,"pos":88078}],"flag":"BLOCK","start":105187,"end":105244,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":826129},"to":{"change":6,"start":88015,"end":88078},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" let mut change_cache = self.change_cache.lock();"}],"del_contents":[{"Del":" let mut change_cache = self.change_cache.borrow_mut();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":126,"ins":{"up_context":[{"change":6,"pos":827293}],"down_context":[{"change":6,"pos":827395}],"flag":"BLOCK","start":105245,"end":105301,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":827293},"to":{"change":6,"start":88354,"end":88416},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" self.change_cache.lock().remove(change_id);"}],"del_contents":[{"Del":" self.change_cache.borrow_mut().remove(change_id);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":136,"ins":{"up_context":[{"change":6,"pos":827590}],"down_context":[{"change":6,"pos":88498}],"flag":"BLOCK","start":105302,"end":105377,"inode":{"change":6,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":827590},"to":{"change":6,"start":88417,"end":88498},"introduced_by":6}],"inode":{"change":6,"pos":824013}},"ins_contents":[{"Add":" if let Some(l) = self.change_cache.lock().get_mut(change_id) {"}],"del_contents":[{"Del":" if let Some(l) = self.change_cache.borrow_mut().get_mut(change_id) {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":831311},"path":"libpijul/src/change.rs","line":154,"ins":{"up_context":[{"change":6,"pos":41041}],"down_context":[{"change":6,"pos":41089}],"flag":"BLOCK","start":105378,"end":105437,"inode":{"change":6,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":41041},"to":{"change":6,"start":41041,"end":41089},"introduced_by":6}],"inode":{"change":6,"pos":831311}},"ins_contents":[{"Add":"#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]"}],"del_contents":[{"Del":"#[derive(Debug, Clone, Serialize, Deserialize)]\n"}]}},{"Replacement":{"inode":{"change":6,"pos":831311},"path":"libpijul/src/change.rs","line":257,"ins":{"up_context":[{"change":6,"pos":837958}],"down_context":[{"change":6,"pos":138351}],"flag":"BLOCK","start":105438,"end":105472,"inode":{"change":6,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":837958},"to":{"change":6,"start":88854,"end":88897},"introduced_by":6}],"inode":{"change":6,"pos":831311}},"ins_contents":[{"Add":" let channel = channel.read();"}],"del_contents":[{"Del":" let channel = channel.read().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":831311},"path":"libpijul/src/change.rs","line":1205,"ins":{"up_context":[{"change":6,"pos":122645}],"down_context":[{"change":6,"pos":867489}],"flag":"BLOCK","start":105473,"end":105568,"inode":{"change":6,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":122645},"to":{"change":6,"start":88991,"end":89107},"introduced_by":6}],"inode":{"change":6,"pos":831311}},"ins_contents":[{"Add":" let (dependencies, extra_known) = dependencies(txn, &channel.read(), changes.iter())?;"}],"del_contents":[{"Del":" let (dependencies, extra_known) =\n dependencies(txn, &channel.read().unwrap(), changes.iter())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":174,"ins":{"up_context":[{"change":6,"pos":122944}],"down_context":[{"change":6,"pos":43278}],"flag":"BLOCK","start":105569,"end":105656,"inode":{"change":6,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":122944},"to":{"change":6,"start":89175,"end":89271},"introduced_by":6}],"inode":{"change":6,"pos":37976}},"ins_contents":[{"Add":" dependencies(txn, &channel.read(), change.hashed.changes.iter()).unwrap();"}],"del_contents":[{"Del":" dependencies(txn, &channel.read().unwrap(), change.hashed.changes.iter()).unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":378,"ins":{"up_context":[{"change":6,"pos":269}],"down_context":[{"change":6,"pos":50578}],"flag":"BLOCK","start":105657,"end":105716,"inode":{"change":6,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":269},"to":{"change":6,"start":4825,"end":4872},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4872},"to":{"change":5,"start":0,"end":44},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":44},"to":{"change":6,"start":4920,"end":4946},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4920},"to":{"change":6,"start":4920,"end":4946},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4991},"to":{"change":6,"start":4991,"end":5011},"introduced_by":6}],"inode":{"change":6,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"File deletion: {:?} \", path,)?;"}],"del_contents":[{"Del":" write!(\n w,\n"},{"Del":" \"File deletion: {:?} \",\n"},{"Del":" path,\n"},{"Del":" )?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":398,"ins":{"up_context":[{"change":6,"pos":308}],"down_context":[{"change":6,"pos":51227}],"flag":"BLOCK","start":105717,"end":105779,"inode":{"change":6,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":308},"to":{"change":6,"start":5133,"end":5180},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5180},"to":{"change":5,"start":112,"end":159},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":159},"to":{"change":6,"start":5231,"end":5257},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5231},"to":{"change":6,"start":5231,"end":5257},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5302},"to":{"change":6,"start":5302,"end":5322},"introduced_by":6}],"inode":{"change":6,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"File un-deletion: {:?} \", path,)?;"}],"del_contents":[{"Del":" write!(\n w,\n"},{"Del":" \"File un-deletion: {:?} \",\n"},{"Del":" path,\n"},{"Del":" )?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":187,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":948054}],"down_context":[{"change":6,"pos":948054}],"flag":"BLOCK","start":105780,"end":106201,"inode":{"change":6,"pos":944089}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"/// Same as [apply_change], but with a wrapped `txn` and `channel`."},{"Add":"pub fn apply_change_arc("},{"Add":" changes: &P,"},{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"},{"Add":" hash: &Hash,"},{"Add":") -> Result<(u64, Merkle), ApplyError> {"},{"Add":" apply_change_ws("},{"Add":" changes,"},{"Add":" &mut *txn.write(),"},{"Add":" &mut *channel.write(),"},{"Add":" hash,"},{"Add":" &mut Workspace::new(),"},{"Add":" )"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":317,"ins":{"up_context":[{"change":6,"pos":126984}],"down_context":[{"change":6,"pos":144106}],"flag":"BLOCK","start":106202,"end":106241,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":126984},"to":{"change":6,"start":90268,"end":90316},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" let mut channel = channel.write();"}],"del_contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Edit":{"inode":{"change":6,"pos":1020742},"path":"libpijul/Cargo.toml","line":147,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":219}],"down_context":[{"change":6,"pos":109305}],"flag":"BLOCK","start":106242,"end":106263,"inode":{"change":6,"pos":1020742}}},"contents":[{"Add":"parking_lot = \"0.11\""}]}},{"Edit":{"inode":{"change":6,"pos":1020742},"path":"libpijul/Cargo.toml","line":152,"atom":{"NewVertex":{"up_context":[{"change":88,"pos":2206}],"down_context":[],"flag":"BLOCK","start":106264,"end":106278,"inode":{"change":6,"pos":1020742}}},"contents":[{"Add":"detone = \"1.0\""}]}}],"owner":"irevoire","repo":"pijul","token":"X1P2GT/Ux91h1QoIO2iUmstiOTchyqcKXAFaM3bv4CA=","login":null}

…

Dependencies

Change contents