{"header":{"message":"Conflict resolution","description":null,"timestamp":"2021-05-11T16:17:54.698028376Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","authors":[],"deps":{"hashes":[["TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","Conflict resolution"],["AA",null],["T3S4P4ETZABWNK6UET3IDKAWRUOUKQNGCSDMTBJZC7U5R47LQ5DQC","Version updates"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["P6WE7YKL6ILKLYKMJUJLGINN7L4U7X4KUIE5ELTK2LEENX3DUBCQC","Unrecord did not check whether a file already existed before adding it back"],["GDDYJH7AJYJ2DWTYVP6WS3FPPRTDRQAXZ2BH2CKIFGMIASTSLD4QC","fix encoded file add"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["4NNR32V6RIG7RAJLHKYNA3YHQDL55RLEKTK72KI4RVBU72F2IXSQC","conflicts"],["UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","store new non-UTF-8 files raw and decode to deplay the contents"],["EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","Fixing a bug with empty new files, and another one with empty replacements"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["WEHUTJUKHOJIBMEK2M7ILPK532FMO7YGWTEAHOIXZP5WOOOSF3ZAC","Lockfile update"],["7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","Cargo.nix and formatting"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","Fixing conflicts in Cargo.lock"],["BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","Version bumps"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","abstract out FileMetadata (de)serialistion"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["JMBGCWM5FYXPAMTU5R7UCMBIHJMUVCT44B6KGQ7P7XZRX662TC4QC","Fixing a zombie, probably due to the new conflict algorithm"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","Fixing SSH asynchronicity issues"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["ENKQ3QZGH2QW246C7GSZRKYLODJOQHKZZSYV7QHB7VPOFP5PASVQC","Forward the exit status messages from the SSH background loop to the client (solving hangs)"],["XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","Fixing conflicts"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["33SQMZYXPV2A3F7P6WBFKFO2BTQV6THSQXOLV3PCZASC6OTKVHTQC","New versions of dependencies"],["QQZNSB26UHFC4EFFREJX2J7SWAKCB3UAI6OKKIOZ4BLXBK6M54VAC","Permission update (after #X243)"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","Proper old metadata when recording"],["W4NSLQNGQVQBB4BEXLFW5OTCBD5XQ4E2BGH3WIFGKSJBCODSUIGQC","make text_encoding available to all of libpijul"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","File deletions were not shown with their names in the metadata during record"],["LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","When recording, do not consider deleted filenames as current"],["246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","decode existing files"],["HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","Version updates"],["VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","text file decoding for new files"],["PDTUHOMVQ2NUN2MMFZL7F4NI3EXOK5SOBBS34DF4ACFOJCB5NQTAC","fix left over conflicts"],["YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","Fixing a parsing problem (related to permissions), and the associated permissions"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","Fixing the parsing of section headers in the text change format"],["X7OHUPL5VYT6ECER2KNGRNFLRX7SBZOM5QWSQ4PBO2UPIE7XM6MAC","Fixing a bug in unrecord, and fixing the tests"],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["RXNT67OTDNFTBYXS6ECDAZ26PRTDROASNYTR6IEXYQUO4K5YNXYQC","Sanakirja version, and removing an unwrap"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","detect non-utf8 text files"],["MDBC27ZUG7U3IWGBIPK5ADCAODQJOVEJVZARAUXB6HW6QMUSLOQAC","Fixing a bug when unrecording directory deletions (the \"directory marker\" in the tree table was not set)"],["H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","Cargo.nix, and solving conflicts"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["JRSBH6HTYXSIZKHW6SGWAF3JCEPMFTUG4JZUSUSF73ODEGFLAAJAC","Identification of line numbers in replacements"],["TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQC","Started fixing the tests for parallel record/output"],["NF4O25IELPL2JJBVM3UXMOWP2VIFWXII7PQD3PX5SUW3RYHKP5XQC","Cleaning up useless operations in InodeMetadata"]],"deps":["T3S4P4ETZABWNK6UET3IDKAWRUOUKQNGCSDMTBJZC7U5R47LQ5DQC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","P6WE7YKL6ILKLYKMJUJLGINN7L4U7X4KUIE5ELTK2LEENX3DUBCQC","GDDYJH7AJYJ2DWTYVP6WS3FPPRTDRQAXZ2BH2CKIFGMIASTSLD4QC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","UDHP4ZVBQZT2VBURB2MDCU2IZDNMCAFSIUKWRBDQ5BWMFKSN2LYQC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","JRSBH6HTYXSIZKHW6SGWAF3JCEPMFTUG4JZUSUSF73ODEGFLAAJAC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","H62VFFJEBL2I3O4D3BAJZ57ROPWUISC7JCDIWFBC5DAYJRHMMDXAC","JMBGCWM5FYXPAMTU5R7UCMBIHJMUVCT44B6KGQ7P7XZRX662TC4QC","KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","33SQMZYXPV2A3F7P6WBFKFO2BTQV6THSQXOLV3PCZASC6OTKVHTQC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","WEHUTJUKHOJIBMEK2M7ILPK532FMO7YGWTEAHOIXZP5WOOOSF3ZAC","ENKQ3QZGH2QW246C7GSZRKYLODJOQHKZZSYV7QHB7VPOFP5PASVQC","LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","EQLDTLXVCARE36EJE3S6SNEVTW2JJY4EYD36EX7WSIFLG2XMKKQAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","QQZNSB26UHFC4EFFREJX2J7SWAKCB3UAI6OKKIOZ4BLXBK6M54VAC","HDGRZISM2SS4TK5BMNGDIYG22SOXAZRTTC6YFIOPY4LSO53QDWZQC","YTQS4ES362EJ27OE45CE5HLY7ZU57YLVKRMDRJ2OXT623VM5WOBQC","X7OHUPL5VYT6ECER2KNGRNFLRX7SBZOM5QWSQ4PBO2UPIE7XM6MAC","RXNT67OTDNFTBYXS6ECDAZ26PRTDROASNYTR6IEXYQUO4K5YNXYQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","MDBC27ZUG7U3IWGBIPK5ADCAODQJOVEJVZARAUXB6HW6QMUSLOQAC","TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQC","6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","W4NSLQNGQVQBB4BEXLFW5OTCBD5XQ4E2BGH3WIFGKSJBCODSUIGQC","UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","PDTUHOMVQ2NUN2MMFZL7F4NI3EXOK5SOBBS34DF4ACFOJCB5NQTAC","XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","4NNR32V6RIG7RAJLHKYNA3YHQDL55RLEKTK72KI4RVBU72F2IXSQC","XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC"]},"hunks":[{"ResurrectZombie":{"inode":{"change":7,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":20,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":1728},"to":{"change":7,"start":24701,"end":25038},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":1728},"to":{"change":7,"start":24701,"end":25038},"introduced_by":7}],"inode":{"change":7,"pos":198172}}},"contents":[{"Add":" fn remove_path(&self, name: &str) -> Result<(), Self::Error>;\n fn rename(&self, former: &str, new: &str) -> Result<(), Self::Error>;\n fn set_permissions(&self, name: &str, permissions: u16) -> Result<(), Self::Error>;\n\n type Writer: std::io::Write;\n fn write_file(&self, file: &str) -> Result;\n"}]}},{"Edit":{"inode":{"change":7,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":26,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2100},"to":{"change":7,"start":65,"end":66},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":2100},"to":{"change":7,"start":65,"end":66},"introduced_by":7}],"inode":{"change":7,"pos":198172}}},"contents":[{"Del":"\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":26,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":66},"to":{"change":7,"start":0,"end":38},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":66},"to":{"change":7,"start":0,"end":38},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":38},"to":{"change":7,"start":139,"end":147},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":139},"to":{"change":7,"start":139,"end":147},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":139},"to":{"change":7,"start":139,"end":147},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":147},"to":{"change":7,"start":39,"end":112},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":147},"to":{"change":7,"start":39,"end":112},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":112},"to":{"change":7,"start":213,"end":233},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":213},"to":{"change":7,"start":213,"end":233},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":213},"to":{"change":7,"start":213,"end":233},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":252},"to":{"change":7,"start":252,"end":351},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":252},"to":{"change":7,"start":252,"end":351},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":351},"to":{"change":7,"start":159,"end":243},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":159},"to":{"change":7,"start":159,"end":243},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":159},"to":{"change":7,"start":159,"end":243},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":243},"to":{"change":7,"start":352,"end":444},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":243},"to":{"change":7,"start":352,"end":444},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":444},"to":{"change":7,"start":113,"end":167},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":444},"to":{"change":7,"start":113,"end":167},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":167},"to":{"change":7,"start":342,"end":560},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":513},"to":{"change":7,"start":342,"end":560},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":342},"to":{"change":7,"start":342,"end":560},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":342},"to":{"change":7,"start":342,"end":560},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":560},"to":{"change":7,"start":168,"end":245},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":560},"to":{"change":7,"start":168,"end":245},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":245},"to":{"change":7,"start":636,"end":726},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":636},"to":{"change":7,"start":636,"end":726},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":636},"to":{"change":7,"start":636,"end":726},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":726},"to":{"change":7,"start":246,"end":287},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":726},"to":{"change":7,"start":246,"end":287},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":287},"to":{"change":7,"start":788,"end":859},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":586},"to":{"change":7,"start":788,"end":859},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":788},"to":{"change":7,"start":788,"end":859},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":788},"to":{"change":7,"start":788,"end":859},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":859},"to":{"change":7,"start":288,"end":309},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":859},"to":{"change":7,"start":288,"end":309},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":309},"to":{"change":7,"start":891,"end":922},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":891},"to":{"change":7,"start":891,"end":922},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":891},"to":{"change":7,"start":891,"end":922},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":922},"to":{"change":7,"start":310,"end":327},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":922},"to":{"change":7,"start":310,"end":327},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":327},"to":{"change":7,"start":950,"end":961},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":950},"to":{"change":7,"start":950,"end":961},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":950},"to":{"change":7,"start":950,"end":961},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":961},"to":{"change":7,"start":328,"end":365},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":961},"to":{"change":7,"start":328,"end":365},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":588},"to":{"change":7,"start":588,"end":609},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":588},"to":{"change":7,"start":588,"end":609},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":588},"to":{"change":7,"start":588,"end":609},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":938},"to":{"change":7,"start":938,"end":946},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":938},"to":{"change":7,"start":938,"end":946},"introduced_by":7}],"inode":{"change":7,"pos":198172}}},"contents":[{"Add":" /// Read the file into the buffer\n"},{"Add":" ///\n"},{"Add":" /// Returns the file's text encoding or None if it was a binary file\n"},{"Add":" fn decode_file(\n"},{"Add":" file: &str,\n buffer: &mut Vec,\n ) -> Result, Self::Error> {\n"},{"Add":" let mut uncoded = Vec::new();\n self.read_file(&file, &mut uncoded)?;\n"},{"Add":" let mime = tree_magic_mini::from_u8(&uncoded);\n debug!(\"mime = {:?}\", mime);\n"},{"Add":" let encoding = if mime.starts_with(\"text/\") {\n"},{"Add":" let mut detector = EncodingDetector::new();\n detector.feed(&uncoded, true);\n let encoding = detector.guess(None, true);\n debug!(\"guessed encoding = {:?}\", encoding.name());\n"},{"Add":" let (_decoded, encoding, malformed) = encoding.decode(&uncoded);\n"},{"Add":" debug!(\"final encoding = {:?}\", encoding.name());\n if !malformed {\n"},{"Add":" Some(Encoding(encoding))\n"},{"Add":" } else {\n warn!(\"text file was malformed\");\n"},{"Add":" None\n"},{"Add":" }\n } else {\n"},{"Add":" None\n"},{"Add":" };\n"},{"Add":" buffer.append(&mut uncoded);\n"},{"Add":" Ok(encoding)\n"},{"Add":" }\n}\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":26,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":25038}],"down_context":[{"change":7,"pos":0}],"flag":"","start":1,"end":1,"inode":{"change":7,"pos":198172}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":30,"ins":{"up_context":[{"change":7,"pos":233}],"down_context":[{"change":7,"pos":252}],"flag":"BLOCK","start":2,"end":17,"inode":{"change":7,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":233},"to":{"change":7,"start":233,"end":252},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":233},"to":{"change":7,"start":233,"end":252},"introduced_by":7}],"inode":{"change":7,"pos":198172}},"ins_contents":[{"Add":" &self,"}],"del_contents":[{"Del":" &mut self,\n"}]}},{"Edit":{"inode":{"change":7,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":55,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":365},"to":{"change":7,"start":587,"end":588},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":998},"to":{"change":7,"start":587,"end":588},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":998},"to":{"change":7,"start":587,"end":588},"introduced_by":7}],"inode":{"change":7,"pos":198172}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":7,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":139,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":221793}],"down_context":[{"change":7,"pos":221793}],"flag":"BLOCK","start":18,"end":39,"inode":{"change":7,"pos":217202}}},"contents":[{"Add":" is_zombie: bool,"}]}},{"Edit":{"inode":{"change":7,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":148,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":221952}],"down_context":[{"change":7,"pos":221952}],"flag":"BLOCK","start":40,"end":70,"inode":{"change":7,"pos":217202}}},"contents":[{"Add":" is_zombie: false,"}]}},{"Edit":{"inode":{"change":7,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":202,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":223399}],"down_context":[{"change":7,"pos":6541}],"flag":"BLOCK","start":71,"end":220,"inode":{"change":7,"pos":217202}}},"contents":[{"Add":" fn end_conflict(&mut self) -> Result<(), std::io::Error> {"},{"Add":" self.is_zombie = false;"},{"Add":" self.output_conflict_marker(END_MARKER)"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":7,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":207,"ins":{"up_context":[{"change":7,"pos":6613}],"down_context":[{"change":7,"pos":223520}],"flag":"BLOCK","start":221,"end":520,"inode":{"change":7,"pos":217202}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":6613},"to":{"change":7,"start":223470,"end":223520},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":223470},"to":{"change":7,"start":223470,"end":223520},"introduced_by":7}],"inode":{"change":7,"pos":217202}},"ins_contents":[{"Add":" if self.is_zombie {"},{"Add":" Ok(())"},{"Add":" } else {"},{"Add":" self.is_zombie = true;"},{"Add":" self.begin_conflict()"},{"Add":" }"},{"Add":" }"},{"Add":" fn end_zombie_conflict(&mut self) -> Result<(), std::io::Error> {"},{"Add":" self.is_zombie = false;"},{"Add":" self.output_conflict_marker(END_MARKER)"}],"del_contents":[{"Del":" self.output_conflict_marker(START_MARKER)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":108,"ins":{"up_context":[{"change":7,"pos":229205}],"down_context":[{"change":7,"pos":48}],"flag":"BLOCK","start":521,"end":579,"inode":{"change":7,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":229205},"to":{"change":7,"start":0,"end":48},"introduced_by":7}],"inode":{"change":7,"pos":225940}},"ins_contents":[{"Add":" let FileMetadata { basename, metadata, .. } = changes"}],"del_contents":[{"Del":" let FileMetadata { basename, .. } = changes\n"}]}},{"Replacement":{"inode":{"change":7,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":127,"ins":{"up_context":[{"change":4,"pos":842}],"down_context":[{"change":4,"pos":873}],"flag":"BLOCK","start":580,"end":615,"inode":{"change":7,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":842},"to":{"change":4,"start":842,"end":873},"introduced_by":4}],"inode":{"change":7,"pos":225940}},"ins_contents":[{"Add":" if metadata.is_dir() {"}],"del_contents":[{"Del":" if meta.is_dir() {\n"}]}},{"Edit":{"inode":{"change":7,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":198,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":229205},"to":{"change":7,"start":0,"end":35},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":229205},"to":{"change":7,"start":0,"end":35},"introduced_by":7}],"inode":{"change":7,"pos":225940}}},"contents":[{"Del":" let (meta, basename) = changes\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":198,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":231483}],"down_context":[],"flag":"","start":617,"end":617,"inode":{"change":7,"pos":225940}}},"contents":[]}},{"FileMove":{"meta":{"basename":"text.rs.XSEODPNEN2Y2S","metadata":0},"old":[{"basename":"text.rs","metadata":0}],"up":[{"change":7,"pos":248792}],"down":[{"change":7,"pos":10}],"show_perms":false}},{"Edit":{"inode":{"change":7,"pos":289338},"path":"libpijul/src/tests/mod.rs","line":119,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":613}],"down_context":[{"change":5,"pos":0}],"flag":"BLOCK","start":642,"end":708,"inode":{"change":7,"pos":289338}}},"contents":[{"Add":"<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"},{"Add":">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"}]}},{"FileMove":{"meta":{"basename":"data.XSEODPNEN2Y2S","metadata":576},"old":[{"basename":"data","metadata":576}],"up":[{"change":7,"pos":248792}],"down":[{"change":7,"pos":4375}],"show_perms":false}},{"SolveOrderConflict":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":12,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":40928}],"down_context":[{"change":6,"pos":1496}],"flag":"","start":731,"end":731,"inode":{"change":7,"pos":488880}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":14,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":124},"to":{"change":7,"start":692,"end":734},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":489199},"to":{"change":7,"start":692,"end":734},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":"use std::collections::{HashMap, HashSet};\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":541,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":53266}],"down_context":[{"change":7,"pos":53266}],"flag":"BLOCK","start":732,"end":765,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" changes,"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":564,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":53804}],"down_context":[{"change":7,"pos":53804}],"flag":"BLOCK","start":766,"end":787,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" changes: &C,"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":613,"ins":{"up_context":[{"change":7,"pos":55791}],"down_context":[{"change":7,"pos":55892}],"flag":"BLOCK","start":788,"end":898,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":55791},"to":{"change":7,"start":55791,"end":55892},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" rec.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex, changes)?"}],"del_contents":[{"Del":" rec.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex)?\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":656,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":56892}],"down_context":[{"change":7,"pos":56892}],"flag":"BLOCK","start":899,"end":910,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" /*"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":664,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":57212}],"down_context":[{"change":7,"pos":57212}],"flag":"BLOCK","start":911,"end":923,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" */"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":668,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":495974},"to":{"change":6,"start":1611,"end":1612},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":495974},"to":{"change":6,"start":1611,"end":1612},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":57327},"to":{"change":7,"start":496436,"end":496437},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":496436},"to":{"change":7,"start":496436,"end":496437},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":496437},"to":{"change":7,"start":735,"end":790},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":496437},"to":{"change":7,"start":735,"end":790},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":885},"to":{"change":7,"start":49402,"end":49474},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":496480},"to":{"change":7,"start":49402,"end":49474},"introduced_by":7},{"previous":"DELETED","flag":"DELETED","from":{"change":7,"pos":496480},"to":{"change":7,"start":49402,"end":49474},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":496480},"to":{"change":7,"start":49402,"end":49474},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49474},"to":{"change":5,"start":84,"end":179},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":49474},"to":{"change":5,"start":84,"end":179},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":5,"pos":179},"to":{"change":7,"start":886,"end":947},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49474},"to":{"change":7,"start":886,"end":947},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":49474},"to":{"change":7,"start":886,"end":947},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":947},"to":{"change":7,"start":49475,"end":49643},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":496630},"to":{"change":7,"start":49475,"end":49643},"introduced_by":7},{"previous":"DELETED","flag":"DELETED","from":{"change":7,"pos":496630},"to":{"change":7,"start":49475,"end":49643},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":496630},"to":{"change":7,"start":49475,"end":49643},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":"\n"},{"Del":"\n"},{"Del":" let (contents, encoding) = if meta.is_file() {\n"},{"Del":" let start = ChangePosition(self.rec.contents.len().into());\n"},{"Del":" let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;\n"},{"Del":" self.rec.has_binary_files |= encoding.is_none();\n"},{"Del":" let end = ChangePosition(self.rec.contents.len().into());\n self.rec.largest_file = self.rec.largest_file.max(end.0.as_u64() - start.0.as_u64());\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":668,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":496480},"to":{"change":7,"start":57328,"end":57391},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":496480},"to":{"change":7,"start":57328,"end":57391},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":496480},"to":{"change":7,"start":57328,"end":57391},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":57460},"to":{"change":7,"start":57460,"end":57611},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":57460},"to":{"change":7,"start":57460,"end":57611},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":57460},"to":{"change":7,"start":57460,"end":57611},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let start = ChangePosition(contents.len().into());\n"},{"Add":" let end = ChangePosition(contents.len().into());\n self.largest_file = self.largest_file.max(end.0.as_u64() - start.0.as_u64());\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":668,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":57327}],"down_context":[],"flag":"","start":925,"end":925,"inode":{"change":7,"pos":488880}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":668,"atom":{"NewVertex":{"up_context":[{"change":0,"pos":925}],"down_context":[{"change":7,"pos":57328}],"flag":"BLOCK","start":926,"end":982,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let (contents_, encoding) = if meta.is_file() {"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":670,"ins":{"up_context":[{"change":7,"pos":57391}],"down_context":[{"change":7,"pos":57460}],"flag":"BLOCK","start":983,"end":1126,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57391},"to":{"change":7,"start":57391,"end":57460},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":57391},"to":{"change":7,"start":57391,"end":57460},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":57391},"to":{"change":7,"start":57391,"end":57460},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" let encoding = working_copy.decode_file(&item.full_path, &mut contents)?;"},{"Add":" self.has_binary_files |= encoding.is_none();"}],"del_contents":[{"Del":" working_copy.read_file(&item.full_path, &mut contents)?;\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":674,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57611},"to":{"change":7,"start":57611,"end":57650},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":57611},"to":{"change":7,"start":57611,"end":57650},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":57611},"to":{"change":7,"start":57611,"end":57650},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":49750},"to":{"change":7,"start":57651,"end":57716},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":49750},"to":{"change":7,"start":57651,"end":57716},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":49750},"to":{"change":7,"start":57651,"end":57716},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":" self.has_binary_files |= {\n"},{"Del":" let utf8 = std::str::from_utf8(&contents[s..e]);\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":674,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":497208},"to":{"change":7,"start":57717,"end":57747},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":497208},"to":{"change":7,"start":57717,"end":57747},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":497208},"to":{"change":7,"start":57717,"end":57747},"introduced_by":7},{"previous":"","flag":"","from":{"change":7,"pos":57747},"to":{"change":7,"start":0,"end":29},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":497247},"to":{"change":7,"start":0,"end":29},"introduced_by":7},{"previous":"DELETED","flag":"","from":{"change":7,"pos":497247},"to":{"change":7,"start":0,"end":29},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":57747},"to":{"change":7,"start":0,"end":29},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" contents.push(0);\n"},{"Add":" if end > start {\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":699,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":497912},"to":{"change":7,"start":57748,"end":57790},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":" self.actions.push(Hunk::FileAdd {\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":699,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":497912},"to":{"change":6,"start":1613,"end":1614},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":497912},"to":{"change":6,"start":1613,"end":1614},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":6,"pos":1687},"to":{"change":6,"start":1687,"end":1851},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":6,"pos":1687},"to":{"change":6,"start":1687,"end":1851},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Add":"\n"},{"Add":" let file_meta = FileMetadata {\n metadata: meta,\n basename: item.basename.as_str(),\n encoding: encoding.clone(),\n };\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":700,"ins":{"up_context":[{"change":6,"pos":1614}],"down_context":[{"change":6,"pos":1687}],"flag":"BLOCK","start":1127,"end":1191,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1614},"to":{"change":6,"start":1614,"end":1687},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":1614},"to":{"change":6,"start":1614,"end":1687},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" let name_start = ChangePosition(contents.len().into());"}],"del_contents":[{"Del":" let name_start = ChangePosition(self.rec.contents.len().into());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":706,"ins":{"up_context":[{"change":6,"pos":1851}],"down_context":[{"change":7,"pos":498023}],"flag":"BLOCK","start":1192,"end":1362,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1851},"to":{"change":6,"start":1851,"end":2007},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":6,"pos":1851},"to":{"change":6,"start":1851,"end":2007},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" file_meta.write(&mut contents);"},{"Add":" let name_end = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"},{"Add":" self.actions.push(Hunk::FileAdd {"}],"del_contents":[{"Del":" file_meta.write(&mut self.rec.contents);\n let name_end = ChangePosition(self.rec.contents.len().into());\n self.rec.contents.push(0);\n\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":729,"ins":{"up_context":[{"change":7,"pos":498736}],"down_context":[{"change":7,"pos":498758}],"flag":"BLOCK","start":1363,"end":1396,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":498736},"to":{"change":7,"start":498736,"end":498758},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" contents: contents_,"}],"del_contents":[{"Del":" contents,\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":801,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6574},"to":{"change":7,"start":58547,"end":58619},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":6574},"to":{"change":7,"start":58547,"end":58619},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":" |p| txn_.get_external(&p).unwrap().map(From::from),\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":801,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":6542},"to":{"change":6,"start":2008,"end":2180},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":6542},"to":{"change":6,"start":2008,"end":2180},"introduced_by":7},{"previous":"","flag":"","from":{"change":6,"pos":2180},"to":{"change":7,"start":361,"end":393},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":361},"to":{"change":7,"start":361,"end":393},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":361},"to":{"change":7,"start":361,"end":393},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let mut meta = Vec::new();\n let FileMetadata {\n basename,\n metadata,\n encoding,\n } = changes\n"},{"Add":" .get_file_meta(\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":808,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":393}],"down_context":[{"change":7,"pos":6645}],"flag":"BLOCK","start":1397,"end":1469,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" |p| txn_.get_external(&p).unwrap().map(From::from),"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":822,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":204},"to":{"change":7,"start":394,"end":450},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":204},"to":{"change":7,"start":394,"end":450},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" basename: basename.to_string(),\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":822,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":50317}],"down_context":[{"change":7,"pos":394}],"flag":"BLOCK","start":1470,"end":1519,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" former_parents.push(Parent {"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":852,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":502201},"to":{"change":6,"start":2248,"end":2309},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":502201},"to":{"change":6,"start":2248,"end":2309},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":" self.former_parents[0].encoding.clone(),\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":852,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":59226}],"down_context":[],"flag":"","start":1521,"end":1521,"inode":{"change":7,"pos":488880}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":852,"atom":{"NewVertex":{"up_context":[{"change":0,"pos":1521}],"down_context":[{"change":7,"pos":33880}],"flag":"BLOCK","start":1522,"end":1578,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" former_parents[0].encoding.clone(),"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":926,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":60119},"to":{"change":7,"start":60119,"end":60561},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":" let name_start = ChangePosition(contents.len().into());\n // Push the metadata, big-endian.\n contents.push((item.metadata.0 >> 8) as u8);\n contents.push((item.metadata.0 & 0xff) as u8);\n //\n contents.extend(item.basename.as_bytes());\n let name_end = ChangePosition(contents.len().into());\n contents.push(0);\n let name = &contents[name_start.0.as_usize()..name_end.0.as_usize()];\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":926,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":48},"to":{"change":7,"start":451,"end":498},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":48},"to":{"change":7,"start":451,"end":498},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":571},"to":{"change":7,"start":571,"end":653},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":571},"to":{"change":7,"start":571,"end":653},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":653},"to":{"change":6,"start":2780,"end":2820},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":653},"to":{"change":6,"start":2780,"end":2820},"introduced_by":7},{"previous":"","flag":"","from":{"change":6,"pos":2820},"to":{"change":7,"start":653,"end":663},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":653},"to":{"change":7,"start":653,"end":663},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":653},"to":{"change":7,"start":653,"end":663},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let basename = item.basename.as_str();\n"},{"Add":" FileMetadata {\n metadata: item.metadata,\n basename,\n"},{"Add":" encoding: encoding.clone(),\n"},{"Add":" }\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":926,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":60119}],"down_context":[{"change":7,"pos":451}],"flag":"","start":1580,"end":1580,"inode":{"change":7,"pos":488880}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":927,"ins":{"up_context":[{"change":7,"pos":498}],"down_context":[{"change":7,"pos":571}],"flag":"BLOCK","start":1581,"end":1645,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":498},"to":{"change":7,"start":498,"end":571},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":498},"to":{"change":7,"start":498,"end":571},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" let meta_start = ChangePosition(contents.len().into());"}],"del_contents":[{"Del":" let meta_start = ChangePosition(self.rec.contents.len().into());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":933,"ins":{"up_context":[{"change":7,"pos":663}],"down_context":[{"change":7,"pos":36030}],"flag":"BLOCK","start":1646,"end":1739,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":663},"to":{"change":7,"start":663,"end":774},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":663},"to":{"change":7,"start":663,"end":774},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" .write(&mut contents);"},{"Add":" let meta_end = ChangePosition(contents.len().into());"}],"del_contents":[{"Del":" .write(&mut self.rec.contents);\n let meta_end = ChangePosition(self.rec.contents.len().into());\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":985,"ins":{"up_context":[{"change":7,"pos":510318}],"down_context":[{"change":7,"pos":510384}],"flag":"BLOCK","start":1740,"end":1799,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":510318},"to":{"change":7,"start":60724,"end":60783},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":510318},"to":{"change":7,"start":881,"end":949},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" contents.truncate(meta_start.0.as_usize())"}],"del_contents":[{"Del":" contents.truncate(name_start.0.as_usize())\n"},{"Del":" self.rec.contents.truncate(meta_start.0.as_usize())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":988,"ins":{"up_context":[{"change":7,"pos":510415}],"down_context":[{"change":7,"pos":510477}],"flag":"BLOCK","start":1800,"end":1855,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":510415},"to":{"change":7,"start":60784,"end":60839},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":510415},"to":{"change":7,"start":950,"end":1014},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" contents.truncate(meta_start.0.as_usize())"}],"del_contents":[{"Del":" contents.truncate(name_start.0.as_usize())\n"},{"Del":" self.rec.contents.truncate(meta_start.0.as_usize())\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":1419,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":504310},"to":{"change":6,"start":2336,"end":2383},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":504310},"to":{"change":6,"start":2336,"end":2383},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6881},"to":{"change":6,"start":2384,"end":2423},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":6881},"to":{"change":6,"start":2384,"end":2423},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":495},"to":{"change":6,"start":2424,"end":2609},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":495},"to":{"change":6,"start":2424,"end":2609},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":851},"to":{"change":6,"start":2610,"end":2656},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":851},"to":{"change":6,"start":2610,"end":2656},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50856},"to":{"change":6,"start":2657,"end":2690},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":50856},"to":{"change":6,"start":2657,"end":2690},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":504935},"to":{"change":6,"start":2691,"end":2712},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":504935},"to":{"change":6,"start":2691,"end":2712},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7149},"to":{"change":6,"start":2713,"end":2742},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":7149},"to":{"change":6,"start":2713,"end":2742},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":50317},"to":{"change":7,"start":58745,"end":58794},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":50317},"to":{"change":7,"start":58745,"end":58794},"introduced_by":7}],"inode":{"change":7,"pos":488880}}},"contents":[{"Del":" let mut meta = Vec::new();\n"},{"Del":" &mut meta,\n"},{"Del":" let FileMetadata { basename: name, .. } = FileMetadata::read(&mut meta);\n if !full_path.is_empty() {\n full_path.push('/');\n"},{"Del":" full_path.push_str(name);\n"},{"Del":" changes,\n"},{"Del":" changes: &C,\n"},{"Del":" changes,\n"},{"Del":" former_parents.push(Parent {\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":1419,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":525217}],"down_context":[],"flag":"","start":1857,"end":1857,"inode":{"change":7,"pos":488880}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":7,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":533,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":68287},"to":{"change":7,"start":62143,"end":62647},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":68287},"to":{"change":7,"start":62143,"end":62647},"introduced_by":6}],"inode":{"change":7,"pos":531056}}},"contents":[{"Add":" let mut k = match cursor.set(txn, &key, None) {\n Ok(Some((k, _))) => k,\n Ok(None) => {\n if let Some((k, _)) = cursor.prev(txn).map_err(|x| BlockError::Txn(x.into()))? {\n k\n } else {\n debug!(\"find_block_end, no prev\");\n return Err(BlockError::Block { block: p });\n }\n }\n Err(e) => {\n debug!(\"find_block_end: BLOCK ERROR\");\n return Err(BlockError::Txn(e.into()));\n }\n"}]}},{"Edit":{"inode":{"change":7,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":533,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":36000}],"down_context":[{"change":7,"pos":62143}],"flag":"BLOCK","start":1858,"end":1967,"inode":{"change":7,"pos":531056}}},"contents":[{"Add":" let mut cursor ="},{"Add":" btree::cursor::Cursor::new(txn, graph).map_err(|x| BlockError::Txn(x.into()))?;"}]}},{"Edit":{"inode":{"change":7,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2265,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":36000},"to":{"change":6,"start":3764,"end":3873},"introduced_by":6},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":36000},"to":{"change":6,"start":3764,"end":3873},"introduced_by":7}],"inode":{"change":7,"pos":531056}}},"contents":[{"Del":" let mut cursor =\n btree::cursor::Cursor::new(txn, graph).map_err(|x| BlockError::Txn(x.into()))?;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2265,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":26498}],"down_context":[],"flag":"","start":1969,"end":1969,"inode":{"change":7,"pos":531056}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":641569},"path":"libpijul/src/pristine/inode_metadata.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":641877},"to":{"change":7,"start":72555,"end":72594},"introduced_by":7}],"inode":{"change":7,"pos":641569}}},"contents":[{"Del":"use byteorder::{BigEndian, ByteOrder};\n"}]}},{"Edit":{"inode":{"change":7,"pos":641569},"path":"libpijul/src/pristine/inode_metadata.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":71,"pos":220}],"down_context":[{"change":7,"pos":643614}],"flag":"BLOCK","start":1970,"end":1976,"inode":{"change":7,"pos":641569}}},"contents":[{"Add":" }"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":780225},"to":{"change":7,"start":150,"end":186},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":780225},"to":{"change":7,"start":150,"end":186},"introduced_by":7}],"inode":{"change":7,"pos":779907}}},"contents":[{"Add":"use crate::text_encoding::Encoding;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":85662}],"down_context":[{"change":7,"pos":150}],"flag":"","start":1978,"end":1978,"inode":{"change":7,"pos":779907}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":83,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":782229},"to":{"change":7,"start":225,"end":324},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":782229},"to":{"change":7,"start":225,"end":324},"introduced_by":7}],"inode":{"change":7,"pos":779907}}},"contents":[{"Add":" Some(Hunk::Edit {\n change: c, local, ..\n }) => {\n"}]}},{"Edit":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":83,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":782186}],"down_context":[{"change":7,"pos":225}],"flag":"BLOCK","start":1979,"end":2018,"inode":{"change":7,"pos":779907}}},"contents":[{"Add":" match self.actions.pop() {"}]}},{"Replacement":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":96,"ins":{"up_context":[{"change":7,"pos":782625}],"down_context":[{"change":7,"pos":441}],"flag":"BLOCK","start":2019,"end":2074,"inode":{"change":7,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":782625},"to":{"change":7,"start":86222,"end":86297},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":782625},"to":{"change":7,"start":382,"end":441},"introduced_by":7}],"inode":{"change":7,"pos":779907}},"ins_contents":[{"Add":" self.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.actions.push(Hunk::Edit { change: c, local })\n"},{"Del":" self.rec.actions.push(Hunk::Edit {\n"}]}},{"Edit":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":361,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":782186},"to":{"change":7,"start":86119,"end":86158},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":782186},"to":{"change":7,"start":86119,"end":86158},"introduced_by":7}],"inode":{"change":7,"pos":779907}}},"contents":[{"Del":" match self.actions.pop() {\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":361,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":793237}],"down_context":[],"flag":"","start":2076,"end":2076,"inode":{"change":7,"pos":779907}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":7,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":793368},"to":{"change":7,"start":640,"end":677},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":793368},"to":{"change":7,"start":640,"end":677},"introduced_by":7}],"inode":{"change":7,"pos":793247}}},"contents":[{"Add":"use crate::text_encoding::Encoding;\n\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":86417}],"down_context":[{"change":7,"pos":640}],"flag":"","start":2078,"end":2078,"inode":{"change":7,"pos":793247}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":7,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":805702},"to":{"change":7,"start":1165,"end":1201},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":805702},"to":{"change":7,"start":1165,"end":1201},"introduced_by":7}],"inode":{"change":7,"pos":805350}}},"contents":[{"Add":"use crate::text_encoding::Encoding;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":9,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":86899}],"down_context":[{"change":7,"pos":1165}],"flag":"","start":2080,"end":2080,"inode":{"change":7,"pos":805350}}},"contents":[]}},{"ResurrectZombie":{"inode":{"change":7,"pos":831311},"path":"libpijul/src/change.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":831409},"to":{"change":7,"start":88731,"end":88751},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":831409},"to":{"change":7,"start":88731,"end":88751},"introduced_by":7}],"inode":{"change":7,"pos":831311}}},"contents":[{"Add":"use crate::HashSet;\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":831311},"path":"libpijul/src/change.rs","line":2,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":831438},"to":{"change":7,"start":88752,"end":88784},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":831438},"to":{"change":7,"start":88752,"end":88784},"introduced_by":7}],"inode":{"change":7,"pos":831311}}},"contents":[{"Add":"use std::collections::BTreeSet;\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":831311},"path":"libpijul/src/change.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":831481},"to":{"change":7,"start":2946,"end":2976},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":831481},"to":{"change":7,"start":2946,"end":2976},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":2977},"to":{"change":7,"start":1442,"end":1502},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":2977},"to":{"change":7,"start":1442,"end":1502},"introduced_by":7}],"inode":{"change":7,"pos":831311}}},"contents":[{"Add":"\nuse chrono::{DateTime, Utc};\n"},{"Add":"use crate::pristine::*;\nuse crate::text_encoding::Encoding;\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":831311},"path":"libpijul/src/change.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":88784}],"down_context":[{"change":7,"pos":2946}],"flag":"","start":2082,"end":2082,"inode":{"change":7,"pos":831311}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":831311},"path":"libpijul/src/change.rs","line":5,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2976},"to":{"change":7,"start":2976,"end":2977},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":2976},"to":{"change":7,"start":2976,"end":2977},"introduced_by":7}],"inode":{"change":7,"pos":831311}}},"contents":[{"Del":"\n"}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":38019},"to":{"change":7,"start":89108,"end":89128},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":38019},"to":{"change":7,"start":89108,"end":89128},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Add":"use crate::HashMap;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":580,"ins":{"up_context":[{"change":7,"pos":57069}],"down_context":[{"change":7,"pos":57195}],"flag":"BLOCK","start":2083,"end":2233,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57069},"to":{"change":7,"start":89461,"end":89589},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":57069},"to":{"change":7,"start":3840,"end":3992},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P \\S+)? \"(?P[^\"]*)\"\"#).unwrap();"}],"del_contents":[{"Del":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P \\S+)?\"#).unwrap();\n"},{"Del":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P [^ ]+)? \"(?P[^\"]*)\"\"#).unwrap();\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":636,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":59651},"to":{"change":7,"start":89630,"end":89730},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":59651},"to":{"change":7,"start":89630,"end":89730},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" contents_.push((meta.0 >> 8) as u8);\n contents_.push((meta.0 & 0xff) as u8);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":643,"ins":{"up_context":[{"change":7,"pos":3176}],"down_context":[{"change":7,"pos":140931}],"flag":"BLOCK","start":2234,"end":2269,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3176},"to":{"change":7,"start":3176,"end":3216},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" meta.write(contents_);"}],"del_contents":[{"Del":" meta.write(&mut contents_);\n"}]}},{"Edit":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":781,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":64590},"to":{"change":7,"start":89731,"end":89831},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":64590},"to":{"change":7,"start":89731,"end":89831},"introduced_by":7}],"inode":{"change":7,"pos":37976}}},"contents":[{"Del":" contents_.push((meta.0 >> 8) as u8);\n contents_.push((meta.0 & 0xff) as u8);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":786,"ins":{"up_context":[{"change":7,"pos":3349}],"down_context":[{"change":7,"pos":141265}],"flag":"BLOCK","start":2270,"end":2305,"inode":{"change":7,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3349},"to":{"change":7,"start":3349,"end":3389},"introduced_by":7}],"inode":{"change":7,"pos":37976}},"ins_contents":[{"Add":" meta.write(contents_);"}],"del_contents":[{"Del":" meta.write(&mut contents_);\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1020742},"path":"libpijul/Cargo.toml","line":119,"ins":{"up_context":[{"change":7,"pos":730}],"down_context":[{"change":7,"pos":5897}],"flag":"BLOCK","start":2306,"end":2332,"inode":{"change":7,"pos":1020742}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":730},"to":{"change":7,"start":2,"end":2},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2},"to":{"change":7,"start":5871,"end":5897},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1023338},"to":{"change":7,"start":5871,"end":5897},"introduced_by":7}],"inode":{"change":7,"pos":1020742}},"ins_contents":[{"Add":"tree_magic_mini = \"3.0.0\""}],"del_contents":[{"Del":""},{"Del":"tree_magic_mini = \"1.0.0\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":5,"ins":{"up_context":[{"change":7,"pos":1030508}],"down_context":[{"change":7,"pos":1030527}],"flag":"BLOCK","start":2333,"end":2352,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1030508},"to":{"change":7,"start":141416,"end":141435},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.15.1\""}],"del_contents":[{"Del":"version = \"0.14.1\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":7,"ins":{"up_context":[{"change":7,"pos":1030592}],"down_context":[{"change":7,"pos":1030670}],"flag":"BLOCK","start":2353,"end":2431,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1030592},"to":{"change":7,"start":141436,"end":141514},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a\""}],"del_contents":[{"Del":"checksum = \"a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":20,"ins":{"up_context":[{"change":7,"pos":1030923}],"down_context":[{"change":7,"pos":1030942}],"flag":"BLOCK","start":2432,"end":2451,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1030923},"to":{"change":7,"start":1030923,"end":1030942},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.7.18\""}],"del_contents":[{"Del":"version = \"0.7.15\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":22,"ins":{"up_context":[{"change":7,"pos":1031007}],"down_context":[{"change":7,"pos":1031085}],"flag":"BLOCK","start":2452,"end":2530,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1031007},"to":{"change":7,"start":1031007,"end":1031085},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f\""}],"del_contents":[{"Del":"checksum = \"7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":64,"ins":{"up_context":[{"change":7,"pos":1032392}],"down_context":[{"change":7,"pos":1032411}],"flag":"BLOCK","start":2531,"end":2550,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1032392},"to":{"change":2,"start":99,"end":118},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.3.59\""}],"del_contents":[{"Del":"version = \"0.3.57\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":66,"ins":{"up_context":[{"change":7,"pos":1032476}],"down_context":[{"change":7,"pos":1032554}],"flag":"BLOCK","start":2551,"end":2629,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1032476},"to":{"change":2,"start":119,"end":197},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744\""}],"del_contents":[{"Del":"checksum = \"78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":69,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1032585}],"down_context":[{"change":7,"pos":1032585}],"flag":"BLOCK","start":2630,"end":2637,"inode":{"change":7,"pos":1030385}}},"contents":[{"Add":" \"cc\","}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":106,"ins":{"up_context":[{"change":7,"pos":460}],"down_context":[{"change":7,"pos":479}],"flag":"BLOCK","start":2638,"end":2657,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":460},"to":{"change":7,"start":460,"end":479},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.19.5\""}],"del_contents":[{"Del":"version = \"0.19.4\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":108,"ins":{"up_context":[{"change":7,"pos":544}],"down_context":[{"change":7,"pos":622}],"flag":"BLOCK","start":2658,"end":2736,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":544},"to":{"change":7,"start":544,"end":622},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321\""}],"del_contents":[{"Del":"checksum = \"a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":117,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":691},"to":{"change":7,"start":1033914,"end":1034177},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1033914},"to":{"change":7,"start":1033914,"end":1034177},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"name = \"blake2b_simd\"\nversion = \"0.5.11\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587\"\ndependencies = [\n \"arrayref\",\n \"arrayvec\",\n \"constant_time_eq\",\n]\n\n[[package]]\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":133,"ins":{"up_context":[{"change":7,"pos":1034498}],"down_context":[{"change":7,"pos":1034517}],"flag":"BLOCK","start":2737,"end":2756,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1034498},"to":{"change":7,"start":151342,"end":151361},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.16\""}],"del_contents":[{"Del":"version = \"0.2.15\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":135,"ins":{"up_context":[{"change":7,"pos":1034582}],"down_context":[{"change":7,"pos":1034660}],"flag":"BLOCK","start":2757,"end":2835,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1034582},"to":{"change":7,"start":151362,"end":151440},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279\""}],"del_contents":[{"Del":"checksum = \"a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":187,"ins":{"up_context":[{"change":7,"pos":5974}],"down_context":[{"change":7,"pos":5993}],"flag":"BLOCK","start":2836,"end":2855,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":5974},"to":{"change":7,"start":5974,"end":5993},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.1.12\""}],"del_contents":[{"Del":"version = \"0.1.10\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":189,"ins":{"up_context":[{"change":7,"pos":6058}],"down_context":[{"change":7,"pos":6136}],"flag":"BLOCK","start":2856,"end":2934,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6058},"to":{"change":7,"start":6058,"end":6136},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"459978032e1aa8d5ca411ee0057ea84f98a93a648ff9f78654e53f33447cf0f9\""}],"del_contents":[{"Del":"checksum = \"f866cba7596c2e70200523e399101d460514a5e59191223aa87d579e49e52025\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":286,"ins":{"up_context":[{"change":7,"pos":117741}],"down_context":[{"change":7,"pos":117759}],"flag":"BLOCK","start":2935,"end":2953,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":117741},"to":{"change":7,"start":117741,"end":117759},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.9.4\""}],"del_contents":[{"Del":"version = \"0.9.3\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":288,"ins":{"up_context":[{"change":7,"pos":117824}],"down_context":[{"change":7,"pos":117902}],"flag":"BLOCK","start":2954,"end":3032,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":117824},"to":{"change":7,"start":117824,"end":117902},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94\""}],"del_contents":[{"Del":"checksum = \"2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":299,"ins":{"up_context":[{"change":7,"pos":902}],"down_context":[{"change":7,"pos":920}],"flag":"BLOCK","start":3033,"end":3051,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":902},"to":{"change":7,"start":17922,"end":17940},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.8.4\""}],"del_contents":[{"Del":"version = \"0.8.3\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":301,"ins":{"up_context":[{"change":7,"pos":985}],"down_context":[{"change":7,"pos":1063}],"flag":"BLOCK","start":3052,"end":3130,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":985},"to":{"change":7,"start":17941,"end":18019},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278\""}],"del_contents":[{"Del":"checksum = \"e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":375,"ins":{"up_context":[{"change":7,"pos":1040602}],"down_context":[{"change":7,"pos":1040620}],"flag":"BLOCK","start":3131,"end":3149,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1040602},"to":{"change":7,"start":1993,"end":2011},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"3.0.2\""}],"del_contents":[{"Del":"version = \"3.0.1\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":377,"ins":{"up_context":[{"change":7,"pos":1040685}],"down_context":[{"change":7,"pos":1040763}],"flag":"BLOCK","start":3150,"end":3228,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1040685},"to":{"change":7,"start":2012,"end":2090},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309\""}],"del_contents":[{"Del":"checksum = \"142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":394,"ins":{"up_context":[{"change":7,"pos":1041091}],"down_context":[{"change":7,"pos":1041109}],"flag":"BLOCK","start":3229,"end":3247,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1041091},"to":{"change":7,"start":1041091,"end":1041109},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.3.6\""}],"del_contents":[{"Del":"version = \"0.3.5\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":396,"ins":{"up_context":[{"change":7,"pos":1041174}],"down_context":[{"change":7,"pos":1041252}],"flag":"BLOCK","start":3248,"end":3326,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1041174},"to":{"change":7,"start":1041174,"end":1041252},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780\""}],"del_contents":[{"Del":"checksum = \"8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":399,"ins":{"up_context":[{"change":7,"pos":1041278}],"down_context":[{"change":7,"pos":791}],"flag":"BLOCK","start":3327,"end":3343,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1041278},"to":{"change":7,"start":295,"end":317},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":" \"redox_users\","}],"del_contents":[{"Del":" \"redox_users 0.3.5\",\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":410,"ins":{"up_context":[{"change":7,"pos":1041536}],"down_context":[{"change":7,"pos":803}],"flag":"BLOCK","start":3344,"end":3360,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1041536},"to":{"change":7,"start":416,"end":438},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":" \"redox_users\","}],"del_contents":[{"Del":" \"redox_users 0.4.0\",\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":481,"ins":{"up_context":[{"change":7,"pos":1043005}],"down_context":[{"change":7,"pos":827}],"flag":"BLOCK","start":3361,"end":3379,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1043005},"to":{"change":2,"start":781,"end":805},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":" \"redox_syscall\","}],"del_contents":[{"Del":" \"redox_syscall 0.2.6\",\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":682,"ins":{"up_context":[{"change":7,"pos":1047789}],"down_context":[{"change":7,"pos":1047808}],"flag":"BLOCK","start":3380,"end":3399,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1047789},"to":{"change":7,"start":1047789,"end":1047808},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.24.0\""}],"del_contents":[{"Del":"version = \"0.23.0\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":684,"ins":{"up_context":[{"change":7,"pos":1047873}],"down_context":[{"change":7,"pos":1047951}],"flag":"BLOCK","start":3400,"end":3478,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1047873},"to":{"change":7,"start":1047873,"end":1047951},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189\""}],"del_contents":[{"Del":"checksum = \"f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":716,"ins":{"up_context":[{"change":7,"pos":1048723}],"down_context":[{"change":7,"pos":1048741}],"flag":"BLOCK","start":3479,"end":3497,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1048723},"to":{"change":2,"start":1797,"end":1815},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.3.3\""}],"del_contents":[{"Del":"version = \"0.3.2\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":718,"ins":{"up_context":[{"change":7,"pos":1048806}],"down_context":[{"change":7,"pos":1048884}],"flag":"BLOCK","start":3498,"end":3576,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1048806},"to":{"change":2,"start":1816,"end":1894},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726\""}],"del_contents":[{"Del":"checksum = \"fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":770,"ins":{"up_context":[{"change":7,"pos":1049974}],"down_context":[{"change":7,"pos":1049992}],"flag":"BLOCK","start":3577,"end":3595,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1049974},"to":{"change":2,"start":1993,"end":2011},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.4.2\""}],"del_contents":[{"Del":"version = \"0.4.1\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":772,"ins":{"up_context":[{"change":7,"pos":1050057}],"down_context":[{"change":7,"pos":1050135}],"flag":"BLOCK","start":3596,"end":3674,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1050057},"to":{"change":2,"start":2012,"end":2090},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9\""}],"del_contents":[{"Del":"checksum = \"5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":781,"ins":{"up_context":[{"change":7,"pos":1050204}],"down_context":[{"change":7,"pos":1050222}],"flag":"BLOCK","start":3675,"end":3693,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1050204},"to":{"change":2,"start":2113,"end":2131},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.4.1\""}],"del_contents":[{"Del":"version = \"1.4.0\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":783,"ins":{"up_context":[{"change":7,"pos":1050287}],"down_context":[{"change":7,"pos":1050365}],"flag":"BLOCK","start":3694,"end":3772,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1050287},"to":{"change":2,"start":2132,"end":2210},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68\""}],"del_contents":[{"Del":"checksum = \"4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":920,"ins":{"up_context":[{"change":7,"pos":1053886}],"down_context":[{"change":7,"pos":1053905}],"flag":"BLOCK","start":3773,"end":3792,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1053886},"to":{"change":2,"start":2703,"end":2722},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.3.51\""}],"del_contents":[{"Del":"version = \"0.3.50\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":922,"ins":{"up_context":[{"change":7,"pos":1053970}],"down_context":[{"change":7,"pos":1054048}],"flag":"BLOCK","start":3793,"end":3871,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1053970},"to":{"change":2,"start":2723,"end":2801},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062\""}],"del_contents":[{"Del":"checksum = \"2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":935,"ins":{"up_context":[{"change":7,"pos":6432}],"down_context":[{"change":7,"pos":6450}],"flag":"BLOCK","start":3872,"end":3890,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6432},"to":{"change":7,"start":882,"end":900},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.7.6\""}],"del_contents":[{"Del":"version = \"0.7.5\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":937,"ins":{"up_context":[{"change":7,"pos":6515}],"down_context":[{"change":7,"pos":6593}],"flag":"BLOCK","start":3891,"end":3969,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6515},"to":{"change":7,"start":901,"end":979},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe\""}],"del_contents":[{"Del":"checksum = \"21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":948,"ins":{"up_context":[{"change":7,"pos":1054747}],"down_context":[{"change":7,"pos":1054766}],"flag":"BLOCK","start":3970,"end":3989,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1054747},"to":{"change":2,"start":2802,"end":2821},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1054747},"to":{"change":7,"start":998,"end":1017},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.94\""}],"del_contents":[{"Del":"version = \"0.2.93\"\n"},{"Del":"version = \"0.2.87\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":950,"ins":{"up_context":[{"change":7,"pos":1054831}],"down_context":[{"change":7,"pos":1054909}],"flag":"BLOCK","start":3990,"end":4068,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1054831},"to":{"change":2,"start":2822,"end":2900},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1054831},"to":{"change":7,"start":1018,"end":1096},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e\""}],"del_contents":[{"Del":"checksum = \"9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41\"\n"},{"Del":"checksum = \"265d751d31d6780a3f956bb5b8022feba2d94eeee5a84ba64f4212eedca42213\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1002,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1055861},"to":{"change":7,"start":118074,"end":118088},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":" \"twox-hash\",\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1003,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":6739}],"down_context":[{"change":7,"pos":1055861}],"flag":"BLOCK","start":4069,"end":4083,"inode":{"change":7,"pos":1030385}}},"contents":[{"Add":" \"twox-hash\","}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1034,"ins":{"up_context":[{"change":7,"pos":1056444}],"down_context":[{"change":7,"pos":1056462}],"flag":"BLOCK","start":4084,"end":4102,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1056444},"to":{"change":7,"start":1056444,"end":1056462},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.1.3\""}],"del_contents":[{"Del":"version = \"1.1.2\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1036,"ins":{"up_context":[{"change":7,"pos":1056527}],"down_context":[{"change":7,"pos":1056605}],"flag":"BLOCK","start":4103,"end":4181,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1056527},"to":{"change":7,"start":1056527,"end":1056605},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66\""}],"del_contents":[{"Del":"checksum = \"602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1052,"ins":{"up_context":[{"change":7,"pos":1056895}],"down_context":[{"change":7,"pos":1056913}],"flag":"BLOCK","start":4182,"end":4200,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1056895},"to":{"change":2,"start":3007,"end":3025},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.4.4\""}],"del_contents":[{"Del":"version = \"0.4.3\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1054,"ins":{"up_context":[{"change":7,"pos":1056978}],"down_context":[{"change":7,"pos":1057056}],"flag":"BLOCK","start":4201,"end":4279,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1056978},"to":{"change":2,"start":3026,"end":3104},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb\""}],"del_contents":[{"Del":"checksum = \"5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1085,"ins":{"up_context":[{"change":7,"pos":1057767}],"down_context":[{"change":7,"pos":1057785}],"flag":"BLOCK","start":4280,"end":4298,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1057767},"to":{"change":7,"start":1057767,"end":1057785},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"2.4.0\""}],"del_contents":[{"Del":"version = \"2.3.4\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1087,"ins":{"up_context":[{"change":7,"pos":1057850}],"down_context":[{"change":7,"pos":1057928}],"flag":"BLOCK","start":4299,"end":4377,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1057850},"to":{"change":7,"start":1057850,"end":1057928},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc\""}],"del_contents":[{"Del":"checksum = \"0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1240,"ins":{"up_context":[{"change":7,"pos":1061523}],"down_context":[{"change":7,"pos":1061542}],"flag":"BLOCK","start":4378,"end":4397,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1061523},"to":{"change":7,"start":155449,"end":155468},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.24.0\""}],"del_contents":[{"Del":"version = \"0.23.0\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1242,"ins":{"up_context":[{"change":7,"pos":1061607}],"down_context":[{"change":7,"pos":1061685}],"flag":"BLOCK","start":4398,"end":4476,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1061607},"to":{"change":7,"start":155469,"end":155547},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170\""}],"del_contents":[{"Del":"checksum = \"a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1247,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1061717},"to":{"change":7,"start":1217,"end":1235},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"version = \"1.7.2\"\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1247,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3418}],"down_context":[{"change":7,"pos":1061735}],"flag":"","start":4478,"end":4478,"inode":{"change":7,"pos":1030385}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1248,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1061800},"to":{"change":2,"start":3419,"end":3497},"introduced_by":2}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"checksum = \"af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1252,"ins":{"up_context":[{"change":7,"pos":1061908}],"down_context":[{"change":7,"pos":1061928}],"flag":"BLOCK","start":4479,"end":4499,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1061908},"to":{"change":2,"start":3498,"end":3518},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.10.34\""}],"del_contents":[{"Del":"version = \"0.10.33\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1254,"ins":{"up_context":[{"change":7,"pos":1061993}],"down_context":[{"change":7,"pos":1062071}],"flag":"BLOCK","start":4500,"end":4578,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1061993},"to":{"change":2,"start":3519,"end":3597},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8\""}],"del_contents":[{"Del":"checksum = \"a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1272,"ins":{"up_context":[{"change":7,"pos":1062411}],"down_context":[{"change":7,"pos":1062430}],"flag":"BLOCK","start":4579,"end":4598,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1062411},"to":{"change":2,"start":3613,"end":3632},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.9.63\""}],"del_contents":[{"Del":"version = \"0.9.61\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1274,"ins":{"up_context":[{"change":7,"pos":1062495}],"down_context":[{"change":7,"pos":1062573}],"flag":"BLOCK","start":4599,"end":4677,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1062495},"to":{"change":2,"start":3633,"end":3711},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98\""}],"del_contents":[{"Del":"checksum = \"313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1328,"ins":{"up_context":[{"change":7,"pos":1063591}],"down_context":[{"change":7,"pos":1063609}],"flag":"BLOCK","start":4678,"end":4696,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1063591},"to":{"change":2,"start":3712,"end":3736},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":" \"redox_syscall\","}],"del_contents":[{"Del":" \"redox_syscall 0.2.6\",\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1434,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1065701},"to":{"change":7,"start":1315,"end":1333},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"version = \"0.2.5\"\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1434,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3951}],"down_context":[{"change":7,"pos":1392}],"flag":"","start":4698,"end":4698,"inode":{"change":7,"pos":1030385}}},"contents":[]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1436,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1457},"to":{"change":7,"start":1334,"end":1412},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"checksum = \"0cf491442e4b033ed1c722cb9f0df5fcfcf4de682466c46469c36bc47dc5548a\"\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1436,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4030}],"down_context":[{"change":7,"pos":1535}],"flag":"","start":4700,"end":4700,"inode":{"change":7,"pos":1030385}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1598,"ins":{"up_context":[{"change":7,"pos":1069063}],"down_context":[{"change":7,"pos":1069082}],"flag":"BLOCK","start":4701,"end":4719,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069063},"to":{"change":7,"start":1069063,"end":1069082},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.8\""}],"del_contents":[{"Del":"version = \"0.1.57\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1600,"ins":{"up_context":[{"change":7,"pos":1069147}],"down_context":[{"change":7,"pos":2417}],"flag":"BLOCK","start":4720,"end":4798,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069147},"to":{"change":7,"start":1069147,"end":1069238},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069238},"to":{"change":7,"start":2233,"end":2256},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2256},"to":{"change":2,"start":4130,"end":4148},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":4148},"to":{"change":7,"start":2274,"end":2339},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9279},"to":{"change":7,"start":2274,"end":2339},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":156387},"to":{"change":7,"start":2274,"end":2339},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2274},"to":{"change":7,"start":2274,"end":2339},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2339},"to":{"change":2,"start":4149,"end":4227},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc\""}],"del_contents":[{"Del":"checksum = \"41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce\"\n\n[[package]]\n"},{"Del":"name = \"redox_syscall\"\n"},{"Del":"version = \"0.2.6\"\n"},{"Del":"source = \"registry+https://github.com/rust-lang/crates.io-index\"\n"},{"Del":"checksum = \"8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1603,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2447},"to":{"change":7,"start":2447,"end":2462},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2462},"to":{"change":7,"start":1069238,"end":1069437},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069238},"to":{"change":7,"start":1069238,"end":1069437},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069437},"to":{"change":7,"start":142351,"end":142372},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":142372},"to":{"change":7,"start":2463,"end":2488},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2488},"to":{"change":7,"start":1069469,"end":1069485},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069469},"to":{"change":7,"start":1069469,"end":1069485},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"]\n\n[[package]]\n"},{"Del":"name = \"redox_users\"\nversion = \"0.3.5\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d\"\ndependencies = [\n"},{"Del":" \"getrandom 0.1.16\",\n"},{"Del":" \"redox_syscall 0.1.57\",\n"},{"Del":" \"rust-argon2\",\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1612,"ins":{"up_context":[{"change":7,"pos":156487}],"down_context":[{"change":7,"pos":2732}],"flag":"BLOCK","start":4799,"end":4817,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":156487},"to":{"change":2,"start":4228,"end":4252},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":" \"redox_syscall\","}],"del_contents":[{"Del":" \"redox_syscall 0.2.6\",\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1617,"ins":{"up_context":[{"change":7,"pos":1069515}],"down_context":[{"change":7,"pos":1069533}],"flag":"BLOCK","start":4818,"end":4836,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069515},"to":{"change":2,"start":4253,"end":4271},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.5.4\""}],"del_contents":[{"Del":"version = \"1.4.6\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1619,"ins":{"up_context":[{"change":7,"pos":1069598}],"down_context":[{"change":7,"pos":1069676}],"flag":"BLOCK","start":4837,"end":4915,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069598},"to":{"change":2,"start":4272,"end":4350},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461\""}],"del_contents":[{"Del":"checksum = \"2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1628,"ins":{"up_context":[{"change":7,"pos":1069792}],"down_context":[{"change":7,"pos":1069811}],"flag":"BLOCK","start":4916,"end":4935,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069792},"to":{"change":2,"start":4351,"end":4370},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.6.25\""}],"del_contents":[{"Del":"version = \"0.6.23\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1630,"ins":{"up_context":[{"change":7,"pos":1069876}],"down_context":[{"change":7,"pos":1069954}],"flag":"BLOCK","start":4936,"end":5014,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1069876},"to":{"change":2,"start":4371,"end":4449},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b\""}],"del_contents":[{"Del":"checksum = \"24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1686,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071022},"to":{"change":7,"start":1071022,"end":1071043},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071043},"to":{"change":7,"start":1126,"end":1144},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1144},"to":{"change":7,"start":1071061,"end":1071126},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071061},"to":{"change":7,"start":1071061,"end":1071126},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071126},"to":{"change":7,"start":1145,"end":1223},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1223},"to":{"change":7,"start":1071204,"end":1071221},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071204},"to":{"change":7,"start":1071204,"end":1071221},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071221},"to":{"change":7,"start":1224,"end":1235},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1235},"to":{"change":7,"start":1071232,"end":1071270},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1736},"to":{"change":7,"start":1071232,"end":1071270},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071232},"to":{"change":7,"start":1071232,"end":1071270},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071270},"to":{"change":7,"start":1236,"end":1256},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1256},"to":{"change":7,"start":1071290,"end":1071305},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1763},"to":{"change":7,"start":1071290,"end":1071305},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071290},"to":{"change":7,"start":1071290,"end":1071305},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"name = \"rust-argon2\"\n"},{"Del":"version = \"0.8.3\"\n"},{"Del":"source = \"registry+https://github.com/rust-lang/crates.io-index\"\n"},{"Del":"checksum = \"4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb\"\n"},{"Del":"dependencies = [\n"},{"Del":" \"base64\",\n"},{"Del":" \"blake2b_simd\",\n \"constant_time_eq\",\n"},{"Del":" \"crossbeam-utils\",\n"},{"Del":"]\n\n[[package]]\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1687,"ins":{"up_context":[{"change":7,"pos":1071329}],"down_context":[{"change":7,"pos":1071348}],"flag":"BLOCK","start":5015,"end":5034,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071329},"to":{"change":7,"start":1071329,"end":1071348},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.1.19\""}],"del_contents":[{"Del":"version = \"0.1.18\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1689,"ins":{"up_context":[{"change":7,"pos":1071413}],"down_context":[{"change":7,"pos":156891}],"flag":"BLOCK","start":5035,"end":5113,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1071413},"to":{"change":7,"start":1071413,"end":1071491},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce\""}],"del_contents":[{"Del":"checksum = \"6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1724,"ins":{"up_context":[{"change":7,"pos":157079}],"down_context":[{"change":7,"pos":157097}],"flag":"BLOCK","start":5114,"end":5132,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":157079},"to":{"change":7,"start":119248,"end":119266},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.2.7\""}],"del_contents":[{"Del":"version = \"1.2.4\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1726,"ins":{"up_context":[{"change":7,"pos":157162}],"down_context":[{"change":7,"pos":157240}],"flag":"BLOCK","start":5133,"end":5211,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":157162},"to":{"change":7,"start":119267,"end":119345},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"81ad8f3bbfb988e3ce4e5e73ee50f5d5a7f99a5e6dba4123b491feebb5da94d5\""}],"del_contents":[{"Del":"checksum = \"c15b6118bc265955b685bee694a1f04c70dfb65344411495d88e716a2cd74a3b\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1843,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1075391},"to":{"change":7,"start":1075391,"end":1075404},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1075404},"to":{"change":7,"start":119346,"end":119534},"introduced_by":7}],"inode":{"change":7,"pos":1030385}}},"contents":[{"Del":"\n[[package]]\n"},{"Del":"name = \"static_assertions\"\nversion = \"1.1.0\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f\"\n"}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1845,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":119547}],"down_context":[{"change":7,"pos":7234}],"flag":"","start":5213,"end":5213,"inode":{"change":7,"pos":1030385}}},"contents":[]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1864,"ins":{"up_context":[{"change":7,"pos":1075798}],"down_context":[{"change":7,"pos":1075817}],"flag":"BLOCK","start":5214,"end":5233,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1075798},"to":{"change":2,"start":5141,"end":5160},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.0.72\""}],"del_contents":[{"Del":"version = \"1.0.70\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1866,"ins":{"up_context":[{"change":7,"pos":1075882}],"down_context":[{"change":7,"pos":1075960}],"flag":"BLOCK","start":5234,"end":5312,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1075882},"to":{"change":2,"start":5161,"end":5239},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82\""}],"del_contents":[{"Del":"checksum = \"b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1899,"ins":{"up_context":[{"change":7,"pos":119563}],"down_context":[{"change":7,"pos":1076541}],"flag":"BLOCK","start":5313,"end":5331,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":119563},"to":{"change":2,"start":5240,"end":5264},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":" \"redox_syscall\","}],"del_contents":[{"Del":" \"redox_syscall 0.2.6\",\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1972,"ins":{"up_context":[{"change":7,"pos":1078238}],"down_context":[{"change":7,"pos":351}],"flag":"BLOCK","start":5332,"end":5351,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1078238},"to":{"change":2,"start":5265,"end":5284},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.32.9\""}],"del_contents":[{"Del":"version = \"0.32.8\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":1974,"ins":{"up_context":[{"change":7,"pos":416}],"down_context":[{"change":7,"pos":1078400}],"flag":"BLOCK","start":5352,"end":5430,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":416},"to":{"change":2,"start":5285,"end":5363},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"72d58952cd321b79c05e8c999b81ed6094b627157c415679fa297007a4a84da9\""}],"del_contents":[{"Del":"checksum = \"139bf84fe168f1af688fb48c586b7eba59ac35684a87b52d973c7bdbc18d9b8f\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2005,"ins":{"up_context":[{"change":7,"pos":1078612}],"down_context":[{"change":7,"pos":1078631}],"flag":"BLOCK","start":5431,"end":5450,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1078612},"to":{"change":7,"start":119564,"end":119583},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.20.4\""}],"del_contents":[{"Del":"version = \"0.20.3\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2007,"ins":{"up_context":[{"change":7,"pos":1078696}],"down_context":[{"change":7,"pos":1078774}],"flag":"BLOCK","start":5451,"end":5529,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1078696},"to":{"change":7,"start":119584,"end":119662},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"ca573360d2c7d31df13c747663e69d7210aa732744feeeb808c8889f40934d02\""}],"del_contents":[{"Del":"checksum = \"32214c32e2327f5a7775879390b944396f23ae28f5f2a71bd2f6352dc6d10215\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2136,"ins":{"up_context":[{"change":7,"pos":1081601}],"down_context":[{"change":7,"pos":1081620}],"flag":"BLOCK","start":5530,"end":5549,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1081601},"to":{"change":7,"start":159202,"end":159221},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.1.26\""}],"del_contents":[{"Del":"version = \"0.1.25\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2138,"ins":{"up_context":[{"change":7,"pos":1081685}],"down_context":[{"change":7,"pos":1081763}],"flag":"BLOCK","start":5550,"end":5628,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1081685},"to":{"change":7,"start":159222,"end":159300},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d\""}],"del_contents":[{"Del":"checksum = \"01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2147,"ins":{"up_context":[{"change":7,"pos":1081881}],"down_context":[{"change":7,"pos":1081900}],"flag":"BLOCK","start":5629,"end":5648,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1081881},"to":{"change":7,"start":1081881,"end":1081900},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.1.18\""}],"del_contents":[{"Del":"version = \"0.1.17\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2149,"ins":{"up_context":[{"change":7,"pos":1081965}],"down_context":[{"change":7,"pos":1082043}],"flag":"BLOCK","start":5649,"end":5727,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1081965},"to":{"change":7,"start":1081965,"end":1082043},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052\""}],"del_contents":[{"Del":"checksum = \"f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2156,"ins":{"up_context":[{"change":7,"pos":7476}],"down_context":[{"change":7,"pos":7494}],"flag":"BLOCK","start":5728,"end":5746,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7476},"to":{"change":7,"start":1792,"end":1810},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"3.0.0\""}],"del_contents":[{"Del":"version = \"1.0.1\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2158,"ins":{"up_context":[{"change":7,"pos":7559}],"down_context":[{"change":7,"pos":7637}],"flag":"BLOCK","start":5747,"end":5825,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7559},"to":{"change":7,"start":1811,"end":1889},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"0687683589ce7d3912e6bf52c1620d970fbed86c27e12118ca779a3780bbf888\""}],"del_contents":[{"Del":"checksum = \"287a760af78a7d607cb231500c06009ea1e0599cd57b10c32760061979bab1f1\"\n"}]}},{"Edit":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2163,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7686}],"down_context":[{"change":7,"pos":7686}],"flag":"BLOCK","start":5826,"end":5840,"inode":{"change":7,"pos":1030385}}},"contents":[{"Add":" \"once_cell\","}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2222,"ins":{"up_context":[{"change":7,"pos":1083842}],"down_context":[{"change":7,"pos":1083860}],"flag":"BLOCK","start":5841,"end":5859,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1083842},"to":{"change":7,"start":1083842,"end":1083860},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.2\""}],"del_contents":[{"Del":"version = \"0.2.1\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2224,"ins":{"up_context":[{"change":7,"pos":1083925}],"down_context":[{"change":7,"pos":1084003}],"flag":"BLOCK","start":5860,"end":5938,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1083925},"to":{"change":7,"start":1083925,"end":1084003},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3\""}],"del_contents":[{"Del":"checksum = \"f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2228,"ins":{"up_context":[{"change":7,"pos":1084029}],"down_context":[{"change":7,"pos":1084047}],"flag":"BLOCK","start":5939,"end":5957,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1084029},"to":{"change":7,"start":159515,"end":159533},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"2.2.2\""}],"del_contents":[{"Del":"version = \"2.2.1\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2230,"ins":{"up_context":[{"change":7,"pos":1084112}],"down_context":[{"change":7,"pos":1084190}],"flag":"BLOCK","start":5958,"end":6036,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1084112},"to":{"change":7,"start":159534,"end":159612},"introduced_by":7}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c\""}],"del_contents":[{"Del":"checksum = \"9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2300,"ins":{"up_context":[{"change":7,"pos":1086008}],"down_context":[{"change":7,"pos":1086027}],"flag":"BLOCK","start":6037,"end":6056,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086008},"to":{"change":2,"start":6168,"end":6187},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.74\""}],"del_contents":[{"Del":"version = \"0.2.73\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2302,"ins":{"up_context":[{"change":7,"pos":1086092}],"down_context":[{"change":7,"pos":1086170}],"flag":"BLOCK","start":6057,"end":6135,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086092},"to":{"change":2,"start":6188,"end":6266},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd\""}],"del_contents":[{"Del":"checksum = \"83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2312,"ins":{"up_context":[{"change":7,"pos":1086298}],"down_context":[{"change":7,"pos":1086317}],"flag":"BLOCK","start":6136,"end":6155,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086298},"to":{"change":2,"start":6267,"end":6286},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.74\""}],"del_contents":[{"Del":"version = \"0.2.73\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2314,"ins":{"up_context":[{"change":7,"pos":1086382}],"down_context":[{"change":7,"pos":1086460}],"flag":"BLOCK","start":6156,"end":6234,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086382},"to":{"change":2,"start":6287,"end":6365},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900\""}],"del_contents":[{"Del":"checksum = \"ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2327,"ins":{"up_context":[{"change":7,"pos":1086616}],"down_context":[{"change":7,"pos":1086635}],"flag":"BLOCK","start":6235,"end":6254,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086616},"to":{"change":2,"start":6366,"end":6385},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.4.24\""}],"del_contents":[{"Del":"version = \"0.4.23\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2329,"ins":{"up_context":[{"change":7,"pos":1086700}],"down_context":[{"change":7,"pos":1086778}],"flag":"BLOCK","start":6255,"end":6333,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086700},"to":{"change":2,"start":6386,"end":6464},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1\""}],"del_contents":[{"Del":"checksum = \"81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2339,"ins":{"up_context":[{"change":7,"pos":1086896}],"down_context":[{"change":7,"pos":1086915}],"flag":"BLOCK","start":6334,"end":6353,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086896},"to":{"change":2,"start":6465,"end":6484},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.74\""}],"del_contents":[{"Del":"version = \"0.2.73\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2341,"ins":{"up_context":[{"change":7,"pos":1086980}],"down_context":[{"change":7,"pos":1087058}],"flag":"BLOCK","start":6354,"end":6432,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1086980},"to":{"change":2,"start":6485,"end":6563},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4\""}],"del_contents":[{"Del":"checksum = \"3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2349,"ins":{"up_context":[{"change":7,"pos":1087167}],"down_context":[{"change":7,"pos":1087186}],"flag":"BLOCK","start":6433,"end":6452,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1087167},"to":{"change":2,"start":6564,"end":6583},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.74\""}],"del_contents":[{"Del":"version = \"0.2.73\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2351,"ins":{"up_context":[{"change":7,"pos":1087251}],"down_context":[{"change":7,"pos":1087329}],"flag":"BLOCK","start":6453,"end":6531,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1087251},"to":{"change":2,"start":6584,"end":6662},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97\""}],"del_contents":[{"Del":"checksum = \"d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2362,"ins":{"up_context":[{"change":7,"pos":1087473}],"down_context":[{"change":7,"pos":1087492}],"flag":"BLOCK","start":6532,"end":6551,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1087473},"to":{"change":2,"start":6663,"end":6682},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.2.74\""}],"del_contents":[{"Del":"version = \"0.2.73\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2364,"ins":{"up_context":[{"change":7,"pos":1087557}],"down_context":[{"change":7,"pos":1087635}],"flag":"BLOCK","start":6552,"end":6630,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1087557},"to":{"change":2,"start":6683,"end":6761},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f\""}],"del_contents":[{"Del":"checksum = \"d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2368,"ins":{"up_context":[{"change":7,"pos":1087665}],"down_context":[{"change":7,"pos":1087684}],"flag":"BLOCK","start":6631,"end":6650,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1087665},"to":{"change":2,"start":6762,"end":6781},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.3.51\""}],"del_contents":[{"Del":"version = \"0.3.50\"\n"}]}},{"Replacement":{"inode":{"change":7,"pos":1030385},"path":"Cargo.lock","line":2370,"ins":{"up_context":[{"change":7,"pos":1087749}],"down_context":[{"change":7,"pos":1087827}],"flag":"BLOCK","start":6651,"end":6729,"inode":{"change":7,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1087749},"to":{"change":2,"start":6782,"end":6860},"introduced_by":2}],"inode":{"change":7,"pos":1030385}},"ins_contents":[{"Add":"checksum = \"e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582\""}],"del_contents":[{"Del":"checksum = \"a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be\"\n"}]}}],"owner":"irevoire","repo":"pijul","token":"CyyGk81EUOwO0TIP05wi6FiyCarHyByc0TMwUww0IVM=","login":null}

…

Dependencies

Change contents