{"header":{"message":"Fix conflicts","description":null,"timestamp":"2025-12-26T19:58:42.533657498Z","authors":[{}]},"hash":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC","authors":[{"login":"pmeunier","key":"8ES6e1QmLjuQn1DzS2DQRKebzCKPHpdf4E9hfwMqQoe7"}],"deps":{"hashes":[["VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC","Fix conflicts"],["AA",null],["Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC","Refactor tag command's handling of repo and channel"],["EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC","🐛 Fix rustc warning"],["XYTAZR367K6JFO7BHY46SIWZQ4J2XU2J2PIQ467E3PG4MQ5Y5ZFAC","Solving conflicts"],["QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC","Fixing warning + formatting"],["7FP2DFNXGKH2GQIH35BAIHMRORXERI6ARZGVVN7LZKMUYIADIULAC","Optimisation: avoid re-checking the entire repo when recording after an unrecord"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["IACED7RWM2ZQIPN3YZATA6SXTRO2C6OUGT3HSOU3LIDZ7YRMLRXAC","text_encoding module"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["JEQCEOQDHPHNBWOKPJR4JR6AQMC4WR3RMHVHHPBBJMQ7IKCVEEPQC","Adding a non-flake shell.nix"],["DFRNZLQ6APMFQUPOPG5BS4RYUBZI32UZVP7T4EKJ7VDGOB3KORCQC","Fixing #798: overwrite check too strict in `pijul apply` when applying a patch adding new files"],["JJQQWDC3DOTW4ILTYPJYPRF5GRS4FPNAQELNLQYUI2D55KQIKPBAC","Version bump"],["J2D66R2DQVRQVQAFFIR4F7RI3BHQFANY2HEGUFRBNUPFVUZAXUTQC","Enable the pager dependency on OSX, fixes build"],["QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","Formatting + big-endian Sanakirja"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["WW2EOFBBX6LGMMRKEVGST2SIITJGMK2MTYDAHUTO6QGYPS2JATLQC","Umask in archives"],["3QGE6HRDSMTV2SNEDC2AJUIR6GIHRU73KXQMZ3BGUYT4H4TAMETQC","Version bump (upgrade to zstd-seekable 0.2, take 2)"],["YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn instead of a simple T"],["4EN4MDBQC3DDMYWY7GNCOR2CUTNQJSKKBUSAH7OTJGNO6FBPY55QC","Update identity dependencies"],["OIOMXESDNMLOTMNYCZZBYSBAQTYPAXXMUHTLA2AYCMNHZMPSLX2AC","Better error handling in HTTP"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["6ZPDI7QGISBFIIJWV4J4JGCZKW2OZA57ZEQSP5YXWRFW3J6PGMVAC","pull uses None as the base case path when outputing repo"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["FDPGJDXVMKCKHKJG2XWZ5JIUDOQDL37JLNNUCA34IL6KNG7J5N7AC","Compiling Thrussh with feature OpenSSL by default"],["UMF6N7CZA4CTSPKQFZSZXA3VRHWQAKEA5GUNIEAAVRWC7FUSSKAAC","Keyring 2.0"],["2TWWWCU4C3DLAECGKC43PYYVWC6DABSGKVXI25QZO5INZHVBZ5LAC","Fixing a warning related to an updated in `chrono`"],["S4LQTDJIXHLNCOVARYKRDSE4H22L5HBQ3AOLYBBNCIS42OOMP24QC","avoid outputting repo multiple times in channel switch"],["VYAJZ7DE2LTJJRBPB4L64TN2HNYTM3PEH5B25TLHNIXB4CXF22AAC","Don't open an editor in `pijul tag create` when `-m` is set"],["SN7AGY6SLIWVKLBHQQ2MZ7VYY4BBFKROC5F3M6FVVFIGT25QNX7AC","Making `pijul lock` robust to kill signals"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["VAPBIG46QVLGCASUE2QLISQ6657CZRAMNEG2PRK7FKEKAYM7FS3QC","Version bump"],["LZOGKBJXRQJKXHYNNENJFGNLP5SHIXGSV6HDB7UVOP7FSA5EUNCQC","new command `pijul client` for authenticating to a HTTP server"],["TCXM4WIJPHMB3QX2QYGVKOFSTETGTB6EXKMYFM6C6PIXLGUGJX3QC","Remove unused dependencies"],["Q3UD2OLQNCBH7AQOH4M3R75KER5GLG2SAB2O2UDAMMBRUEKQMCXAC","Fixing warning from chrono"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","Migrate from `pijul::config` to `pijul-config`"],["DVBSW7SICQMTYIC4NOLA3CBRU5OWPAWX3MYEOZ7UWXF3IJLLJDYQC","Bump dependencies with minor-level changes"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["4PX6WLAFTZZY6O57NEAPWZG25NR2TZ4KESKPRMS3G3QVKL7L6LNQC","Refactor archive command's handling of repo and channel"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["RPZK3JQAOB3LSEFZFLCYFDVYLRX547FFSN5FWUTTB6JATROL4CTAC","Fixing a conflict"],["GYXIF25T2BCTCWCQI5DQOF3F4HBWDJUDJUMZ2WLHVBIOYATJTFAQC","Proper parsing of URLs"],["RR65HCKOJU45UCNU5X3XM5HSIRHVUZU4IO4HEBQYHS22HYIIWITQC","Thrussh versions"],["CVCT4WHHVWPOTHVPJICIJM4BFGNLK47SGNASCKQXIMIB6ARQPGUAC","Version bump"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["NACNZRJE4UWFNMAPOV2TLQHQRJ5BND6T2B4WVYW5YGJ3OOZSWQPQC","xxHash in oldshell.nix"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["M2C6QW2AEUCPOM7UDQHXRXVV2Z4GQMEKZZKPM6GT7DG2CPIDUWAAC","Avoid serialising twice in order to save the changes' signatures"],["KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","Fixing a panic in pull"],["Y6TBQN7MFWX4SKJM2UGDGR4UMMDEO4TPNNJZKZWHEBTW7MPX4WWQC","Automatically format `pijul` crate"],["2MKP7CB7FKQUNEAV3YPEJ7FNFW75VGGQIYPQRI54BFXGCUOQESPAC","Move dependencies into workspace `Cargo.toml`"],["V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","Using path-slash to fix path issues on Windows"],["N26HD5PFUNVDSEXAQVOTMSMNPWFHQSZ5PHMGEF2ACC23OWFHTGQQC","Replace `chrono` with `jiff`"],["TFPETWTVADLG2DL7WERHJPGMJVOY4WOKCRWB3NZ3YOOQ4CVAUHBAC","Add config options for patch message templates\n"],["JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","Migrate from `pijul::progress` to `pijul_interaction::progress`"],["HJVWPKWVSL5ZXALZOT4BOQUWWNGH62OU6YLSZQQEIOB37QQGHK6AC","Migrate crates to edition 2024"],["HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","Solving conflicts"],["HYRH4E55TIRBB3RFFR432METJPNVBSPL6DJVHXE5XGFGZAGBACDAC","rustfmt.toml: init"],["5RSZPNQRUWZFLQIV64CAP4D47BHY4UCBY2R57NB2VCZ5VZF5SBGQC","Upgrade `clap` 3.2 -> 4.3"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["RPY5P6GWRZ7DBJFWLTAAB36JCOJ672VBNGJXLCOEJZOCDSWNYG2QC","Update minimum chrono version"],["DDJO7X2P2BAJSXPOE6ODKAJM7GRWKPT36WWTUZ373ZWQRYU4CFIAC","Remove dependency on `num_cpus`"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["3X5ZCEPZDO2UYKQHX5YN7DC6J2WPHGR6X736NRF7QMLSUVUBYZOAC","Fixing a panic when `pijul archive` does not find the channel"],["33LXFADR7356GG6L6Q3RDCSXELOOKOICMMLNICIK7IXF2SDXDK3AC","Update `toml` to latest version"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["HKA66XOQ5LOF3E5DIQGVKPEZGZKCXLLYRVTKDK7SAD7Y5JZB5OUQC","Updating Thrussh version for long or massive connections"],["NABOB7CQIQNLFXHPR2LMOHTQLYXRB7WCBTF2CZQZURSS4E4SWV5QC","Solving a conflict"],["VKBJ6XB64MVCKJ4TWX2T4XUBEOKD55WW6CUF47DINVZQGSCVAXJAC","Formatting and version bump"],["QAXLX3UAV6R66K2GERT7FJBPNULWAUSO3DFME3CLEZDBG55I4IRAC","Backwards-compatibility: moving old paths to the new \"roots\" feature"],["TEDGMEHFZK6QKSXVOHM3Z4MYZC26EDCWRURHWKOU2JLETWJIJPLQC","Introduce subcommand for completion-script generation."],["RVAH6PXA7H7NUDTF7Q52I7EXGXVJVMGI2LTNN6L3MVEDEMAXVH4AC","Getting libpijul to compile to WASM32"],["C6SOSQCVVNBHQ67TUEJ5XQ4WEA4HPWHMVKECC3RD3LCKWHRI7S5QC","Formatting"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","Reading ~/.ssh/config"],["7ZROQSSN2M3LW6ASYMM6DPR5AERWV4K4TKWKEBKTCEJPMIJAHHXQC","Handling TAG uploads from the `pijul protocol` command"],["JMOHVR5EL27IRLXO66W52DA4K33L467O5J5DRX2ARZTFM6JRHDVQC","Bump edition to 2021"],["TYAKEAJLABCZQDYAI4YBGIJNQ7HJS4DVULEGPCZOGJPJUYYNR6TAC","A better estimate of the maximum number of open patches we can keep (Unix-only at the moment)"],["5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","Re-implement change printing and parsing"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC","Migrate from `pijul::repository` to `pijul-repository`"],["FZ7MXL3BGIDZEEEKWX4CHAKPDO46FFF5BZDL6S2KOWTZ53GE7D6AC","Allow to use short tag hashes"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"]],"deps":["Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC","EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC","XYTAZR367K6JFO7BHY46SIWZQ4J2XU2J2PIQ467E3PG4MQ5Y5ZFAC","QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC","7FP2DFNXGKH2GQIH35BAIHMRORXERI6ARZGVVN7LZKMUYIADIULAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","RR65HCKOJU45UCNU5X3XM5HSIRHVUZU4IO4HEBQYHS22HYIIWITQC","RPZK3JQAOB3LSEFZFLCYFDVYLRX547FFSN5FWUTTB6JATROL4CTAC","HYRH4E55TIRBB3RFFR432METJPNVBSPL6DJVHXE5XGFGZAGBACDAC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","KI2AFWOSN3PTGBGYQ7UKHFOZERZWEUWQ4AQNADG5S4QDJ53ESXFAC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","GYXIF25T2BCTCWCQI5DQOF3F4HBWDJUDJUMZ2WLHVBIOYATJTFAQC","SN7AGY6SLIWVKLBHQQ2MZ7VYY4BBFKROC5F3M6FVVFIGT25QNX7AC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","J2D66R2DQVRQVQAFFIR4F7RI3BHQFANY2HEGUFRBNUPFVUZAXUTQC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","TFPETWTVADLG2DL7WERHJPGMJVOY4WOKCRWB3NZ3YOOQ4CVAUHBAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","IACED7RWM2ZQIPN3YZATA6SXTRO2C6OUGT3HSOU3LIDZ7YRMLRXAC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","HKA66XOQ5LOF3E5DIQGVKPEZGZKCXLLYRVTKDK7SAD7Y5JZB5OUQC","OIOMXESDNMLOTMNYCZZBYSBAQTYPAXXMUHTLA2AYCMNHZMPSLX2AC","WW2EOFBBX6LGMMRKEVGST2SIITJGMK2MTYDAHUTO6QGYPS2JATLQC","TYAKEAJLABCZQDYAI4YBGIJNQ7HJS4DVULEGPCZOGJPJUYYNR6TAC","FDPGJDXVMKCKHKJG2XWZ5JIUDOQDL37JLNNUCA34IL6KNG7J5N7AC","FZ7MXL3BGIDZEEEKWX4CHAKPDO46FFF5BZDL6S2KOWTZ53GE7D6AC","3QGE6HRDSMTV2SNEDC2AJUIR6GIHRU73KXQMZ3BGUYT4H4TAMETQC","M2C6QW2AEUCPOM7UDQHXRXVV2Z4GQMEKZZKPM6GT7DG2CPIDUWAAC","5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","VKBJ6XB64MVCKJ4TWX2T4XUBEOKD55WW6CUF47DINVZQGSCVAXJAC","QAXLX3UAV6R66K2GERT7FJBPNULWAUSO3DFME3CLEZDBG55I4IRAC","VAPBIG46QVLGCASUE2QLISQ6657CZRAMNEG2PRK7FKEKAYM7FS3QC","7ZROQSSN2M3LW6ASYMM6DPR5AERWV4K4TKWKEBKTCEJPMIJAHHXQC","4EN4MDBQC3DDMYWY7GNCOR2CUTNQJSKKBUSAH7OTJGNO6FBPY55QC","UMF6N7CZA4CTSPKQFZSZXA3VRHWQAKEA5GUNIEAAVRWC7FUSSKAAC","6ZPDI7QGISBFIIJWV4J4JGCZKW2OZA57ZEQSP5YXWRFW3J6PGMVAC","TEDGMEHFZK6QKSXVOHM3Z4MYZC26EDCWRURHWKOU2JLETWJIJPLQC","LZOGKBJXRQJKXHYNNENJFGNLP5SHIXGSV6HDB7UVOP7FSA5EUNCQC","3X5ZCEPZDO2UYKQHX5YN7DC6J2WPHGR6X736NRF7QMLSUVUBYZOAC","YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","2TWWWCU4C3DLAECGKC43PYYVWC6DABSGKVXI25QZO5INZHVBZ5LAC","Y6TBQN7MFWX4SKJM2UGDGR4UMMDEO4TPNNJZKZWHEBTW7MPX4WWQC","RVAH6PXA7H7NUDTF7Q52I7EXGXVJVMGI2LTNN6L3MVEDEMAXVH4AC","CVCT4WHHVWPOTHVPJICIJM4BFGNLK47SGNASCKQXIMIB6ARQPGUAC","JEQCEOQDHPHNBWOKPJR4JR6AQMC4WR3RMHVHHPBBJMQ7IKCVEEPQC","C6SOSQCVVNBHQ67TUEJ5XQ4WEA4HPWHMVKECC3RD3LCKWHRI7S5QC","Q3UD2OLQNCBH7AQOH4M3R75KER5GLG2SAB2O2UDAMMBRUEKQMCXAC","DFRNZLQ6APMFQUPOPG5BS4RYUBZI32UZVP7T4EKJ7VDGOB3KORCQC","QWIYNMI5SOTLRPYE4O3AG7R75JXM2TB3ZADU646PG6ACPBGSYUYAC","JMOHVR5EL27IRLXO66W52DA4K33L467O5J5DRX2ARZTFM6JRHDVQC","DVBSW7SICQMTYIC4NOLA3CBRU5OWPAWX3MYEOZ7UWXF3IJLLJDYQC","S4LQTDJIXHLNCOVARYKRDSE4H22L5HBQ3AOLYBBNCIS42OOMP24QC","JUYSZJSHULJFR4HUJF72TEKKFMBPG4ZOGAGOJ2BX6P3D4DRZAU5QC","4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC","DDJO7X2P2BAJSXPOE6ODKAJM7GRWKPT36WWTUZ373ZWQRYU4CFIAC","ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC","HJVWPKWVSL5ZXALZOT4BOQUWWNGH62OU6YLSZQQEIOB37QQGHK6AC","5RSZPNQRUWZFLQIV64CAP4D47BHY4UCBY2R57NB2VCZ5VZF5SBGQC","RPY5P6GWRZ7DBJFWLTAAB36JCOJ672VBNGJXLCOEJZOCDSWNYG2QC","NABOB7CQIQNLFXHPR2LMOHTQLYXRB7WCBTF2CZQZURSS4E4SWV5QC","JJQQWDC3DOTW4ILTYPJYPRF5GRS4FPNAQELNLQYUI2D55KQIKPBAC","2MKP7CB7FKQUNEAV3YPEJ7FNFW75VGGQIYPQRI54BFXGCUOQESPAC","TCXM4WIJPHMB3QX2QYGVKOFSTETGTB6EXKMYFM6C6PIXLGUGJX3QC","HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC","N26HD5PFUNVDSEXAQVOTMSMNPWFHQSZ5PHMGEF2ACC23OWFHTGQQC","VYAJZ7DE2LTJJRBPB4L64TN2HNYTM3PEH5B25TLHNIXB4CXF22AAC","33LXFADR7356GG6L6Q3RDCSXELOOKOICMMLNICIK7IXF2SDXDK3AC","4PX6WLAFTZZY6O57NEAPWZG25NR2TZ4KESKPRMS3G3QVKL7L6LNQC","NACNZRJE4UWFNMAPOV2TLQHQRJ5BND6T2B4WVYW5YGJ3OOZSWQPQC"]},"hunks":[{"Edit":{"inode":{"change":7,"pos":15},"path":"rustfmt.toml","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":15},"to":{"change":7,"start":0,"end":17},"introduced_by":7}],"inode":{"change":7,"pos":15}}},"contents":[{"Del":{"text":"edition = \"2024\"","pos":"HJVWPKWVSL5ZXALZOT4BOQUWWNGH62OU6YLSZQQEIOB37QQGHK6AC:16"}}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1043,"ins":{"up_context":[{"change":7,"pos":835}],"down_context":[{"change":6,"pos":39}],"flag":"BLOCK","start":0,"end":35,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":835},"to":{"change":6,"start":0,"end":39},"introduced_by":6}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":{"text":" let working_copy =","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:34"}}],"del_contents":[{"Del":{"text":" let mut working_copy =","pos":"7FP2DFNXGKH2GQIH35BAIHMRORXERI6ARZGVVN7LZKMUYIADIULAC:38"}}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1059,"ins":{"up_context":[{"change":6,"pos":368}],"down_context":[{"change":6,"pos":411}],"flag":"BLOCK","start":36,"end":75,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":368},"to":{"change":6,"start":368,"end":411},"introduced_by":6}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":{"text":" &working_copy,","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:74"}}],"del_contents":[{"Del":{"text":" &mut working_copy,","pos":"7FP2DFNXGKH2GQIH35BAIHMRORXERI6ARZGVVN7LZKMUYIADIULAC:410"}}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul-remote/src/lib.rs","line":1067,"ins":{"up_context":[{"change":7,"pos":551}],"down_context":[{"change":7,"pos":61724}],"flag":"BLOCK","start":76,"end":294,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":551},"to":{"change":7,"start":61657,"end":61724},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":9110},"to":{"change":7,"start":61657,"end":61724},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61657},"to":{"change":7,"start":61657,"end":61724},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":{"text":" txn.archive::<_, _, libpijul::working_copy::filesystem::FileSystem>(","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:164"}},{"Add":{"text":" &changes,","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:198"}},{"Add":{"text":" &channel,","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:232"}},{"Add":{"text":" &mut tarball,","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:270"}},{"Add":{"text":" )?","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:293"}}],"del_contents":[{"Del":{"text":" txn.archive(&changes, &channel, &mut tarball)?","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:61723"}}]}},{"Edit":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":260,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":163},"to":{"change":5,"start":137,"end":217},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":163},"to":{"change":5,"start":137,"end":217},"introduced_by":7}],"inode":{"change":7,"pos":74}}},"contents":[{"Del":{"text":" if let Ok(header) = toml::from_str(&std::str::from_utf8(&bytes)?) {","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:216"}}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":260,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":117}],"down_context":[{"change":7,"pos":222}],"flag":"","start":295,"end":295,"inode":{"change":7,"pos":74}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:295"}}]}},{"Edit":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":291,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1459},"to":{"change":2,"start":1956,"end":1956},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":5248},"to":{"change":5,"start":76,"end":136},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":5248},"to":{"change":5,"start":76,"end":136},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136},"to":{"change":7,"start":50,"end":50},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":1315},"to":{"change":7,"start":50,"end":50},"introduced_by":7}],"inode":{"change":7,"pos":74}}},"contents":[{"Del":{"text":"","pos":"Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC:1956"}},{"Del":{"text":" chrono::DateTime::from_timestamp(t, 0).unwrap()","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:135"}},{"Del":{"text":"","pos":"HKHMES6TWN5F7VTIC6GRV7ZBUCZ7KQUCSCKIA7PV2T5HKK4FD2FAC:50"}}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":74},"path":"pijul/src/commands/tag.rs","line":291,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1459}],"down_context":[],"flag":"","start":296,"end":296,"inode":{"change":7,"pos":74}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:296"}}]}},{"Replacement":{"inode":{"change":7,"pos":97650},"path":"pijul/src/commands/reset.rs","line":180,"ins":{"up_context":[{"change":7,"pos":10165}],"down_context":[{"change":7,"pos":10202}],"flag":"BLOCK","start":297,"end":347,"inode":{"change":7,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":10165},"to":{"change":7,"start":90,"end":130},"introduced_by":7}],"inode":{"change":7,"pos":97650}},"ins_contents":[{"Add":{"text":" paths.insert(path.join(\"/\"));","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:346"}}],"del_contents":[{"Del":{"text":" paths.insert(path);","pos":"S4LQTDJIXHLNCOVARYKRDSE4H22L5HBQ3AOLYBBNCIS42OOMP24QC:129"}}]}},{"Replacement":{"inode":{"change":7,"pos":101759},"path":"pijul/src/commands/record.rs","line":161,"ins":{"up_context":[{"change":7,"pos":208}],"down_context":[{"change":7,"pos":286}],"flag":"BLOCK","start":348,"end":429,"inode":{"change":7,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":208},"to":{"change":5,"start":218,"end":294},"introduced_by":5}],"inode":{"change":7,"pos":101759}},"ins_contents":[{"Add":{"text":" \"signature\": secret.sign_raw(&hash.to_bytes()).unwrap(),","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:428"}}],"del_contents":[{"Del":{"text":" \"signature\": secret.sign_raw(&hash_bytes).unwrap(),","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:293"}}]}},{"Edit":{"inode":{"change":7,"pos":101759},"path":"pijul/src/commands/record.rs","line":255,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":105980},"to":{"change":5,"start":295,"end":359},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":105980},"to":{"change":5,"start":295,"end":359},"introduced_by":7}],"inode":{"change":7,"pos":101759}}},"contents":[{"Del":{"text":" chrono::DateTime::from_timestamp(t, 0).unwrap()","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:358"}}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":101759},"path":"pijul/src/commands/record.rs","line":255,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":1595}],"down_context":[{"change":7,"pos":1459}],"flag":"","start":430,"end":430,"inode":{"change":7,"pos":101759}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:430"}}]}},{"Replacement":{"inode":{"change":7,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":844,"ins":{"up_context":[{"change":7,"pos":10897}],"down_context":[{"change":7,"pos":10946}],"flag":"BLOCK","start":431,"end":493,"inode":{"change":7,"pos":111631}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":10897},"to":{"change":7,"start":98,"end":150},"introduced_by":7}],"inode":{"change":7,"pos":111631}},"ins_contents":[{"Add":{"text":" touched_paths.insert(path.join(\"/\"));","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:492"}}],"del_contents":[{"Del":{"text":" touched_paths.insert(path);","pos":"6ZPDI7QGISBFIIJWV4J4JGCZKW2OZA57ZEQSP5YXWRFW3J6PGMVAC:149"}}]}},{"Edit":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":49,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":124745}],"down_context":[{"change":7,"pos":124745}],"flag":"BLOCK","start":494,"end":552,"inode":{"change":7,"pos":123281}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:494"}},{"Add":{"text":"type W = libpijul::working_copy::filesystem::FileSystem;","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:551"}}]}},{"Replacement":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":295,"ins":{"up_context":[{"change":7,"pos":12446}],"down_context":[{"change":7,"pos":131952}],"flag":"BLOCK","start":553,"end":640,"inode":{"change":7,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":12446},"to":{"change":7,"start":601,"end":677},"introduced_by":7}],"inode":{"change":7,"pos":123281}},"ins_contents":[{"Add":{"text":" txn.archive::<_, _, W>(&repo.changes, &channel, &mut tarball)?","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:639"}}],"del_contents":[{"Del":{"text":" txn.archive(&repo.changes, &channel, &mut tarball)?","pos":"YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC:676"}}]}},{"Replacement":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":320,"ins":{"up_context":[{"change":7,"pos":132737}],"down_context":[{"change":7,"pos":132809}],"flag":"BLOCK","start":641,"end":724,"inode":{"change":7,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":132737},"to":{"change":7,"start":926,"end":998},"introduced_by":7}],"inode":{"change":7,"pos":123281}},"ins_contents":[{"Add":{"text":" txn.archive::<_, _, W>(&repo.changes, &channel, &mut tarball)?","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:723"}}],"del_contents":[{"Del":{"text":" txn.archive(&repo.changes, &channel, &mut tarball)?","pos":"YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC:997"}}]}},{"Replacement":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":123,"ins":{"up_context":[{"change":7,"pos":193815}],"down_context":[{"change":7,"pos":194009}],"flag":"BLOCK","start":725,"end":877,"inode":{"change":7,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4819},"to":{"change":7,"start":2889,"end":2957},"introduced_by":7}],"inode":{"change":7,"pos":191083}},"ins_contents":[{"Add":{"text":" type W = libpijul::working_copy::filesystem::FileSystem;","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:797"}},{"Add":{"text":" txn.archive::<_, _, W>(&repo.changes, &channel, &mut tarball)?","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:876"}}],"del_contents":[{"Del":{"text":" txn.archive(&repo.changes, &channel, &mut tarball)?","pos":"YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC:2956"}}]}},{"Replacement":{"inode":{"change":7,"pos":194289},"path":"pijul/src/commands/apply.rs","line":122,"ins":{"up_context":[{"change":7,"pos":138}],"down_context":[{"change":7,"pos":1908}],"flag":"BLOCK","start":878,"end":938,"inode":{"change":7,"pos":194289}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":138},"to":{"change":7,"start":138,"end":188},"introduced_by":7}],"inode":{"change":7,"pos":194289}},"ins_contents":[{"Add":{"text":" touched_files.push(path.join(\"/\"));","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:937"}}],"del_contents":[{"Del":{"text":" touched_files.push(path);","pos":"DFRNZLQ6APMFQUPOPG5BS4RYUBZI32UZVP7T4EKJ7VDGOB3KORCQC:187"}}]}},{"Edit":{"inode":{"change":7,"pos":196374},"path":"pijul/Cargo.toml","line":54,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":197381},"to":{"change":5,"start":530,"end":550},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":197381},"to":{"change":5,"start":530,"end":550},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":197652},"to":{"change":5,"start":551,"end":564},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":197652},"to":{"change":5,"start":551,"end":564},"introduced_by":7}],"inode":{"change":7,"pos":196374}}},"contents":[{"Del":{"text":"human-panic = \"2.0\"","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:549"}},{"Del":{"text":"toml = \"0.8\"","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:563"}}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":196374},"path":"pijul/Cargo.toml","line":54,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3375}],"down_context":[{"change":7,"pos":118}],"flag":"","start":939,"end":939,"inode":{"change":7,"pos":196374}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:939"}}]}},{"ResurrectZombie":{"inode":{"change":7,"pos":196374},"path":"pijul/Cargo.toml","line":55,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"","from":{"change":7,"pos":140},"to":{"change":7,"start":3376,"end":3448},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK","from":{"change":7,"pos":197665},"to":{"change":7,"start":3376,"end":3448},"introduced_by":7},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":140},"to":{"change":7,"start":3376,"end":3448},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK","from":{"change":7,"pos":197665},"to":{"change":7,"start":3376,"end":3448},"introduced_by":5}],"inode":{"change":7,"pos":196374}}},"contents":[{"Add":{"text":"url.workspace = true","pos":"2MKP7CB7FKQUNEAV3YPEJ7FNFW75VGGQIYPQRI54BFXGCUOQESPAC:3396"}},{"Add":{"text":"validator.workspace = true","pos":"2MKP7CB7FKQUNEAV3YPEJ7FNFW75VGGQIYPQRI54BFXGCUOQESPAC:3423"}},{"Add":{"text":"whoami.workspace = true","pos":"2MKP7CB7FKQUNEAV3YPEJ7FNFW75VGGQIYPQRI54BFXGCUOQESPAC:3447"}}]}},{"Edit":{"inode":{"change":7,"pos":196374},"path":"pijul/Cargo.toml","line":58,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3448}],"down_context":[{"change":7,"pos":0}],"flag":"BLOCK","start":940,"end":941,"inode":{"change":7,"pos":196374}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:940"}}]}},{"Edit":{"inode":{"change":7,"pos":196374},"path":"pijul/Cargo.toml","line":64,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":146},"to":{"change":5,"start":565,"end":606},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":146},"to":{"change":5,"start":565,"end":606},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1650},"to":{"change":5,"start":607,"end":650},"introduced_by":5},{"previous":"BLOCK | DELETED","flag":"BLOCK | DELETED","from":{"change":7,"pos":1650},"to":{"change":5,"start":607,"end":650},"introduced_by":7}],"inode":{"change":7,"pos":196374}}},"contents":[{"Del":{"text":"thrussh = \"0.35.4\"","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:583"}},{"Del":{"text":"thrussh-keys = \"0.22\"","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:605"}},{"Del":{"text":"hex = { version = \"0.4\", optional = true }","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:649"}}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":196374},"path":"pijul/Cargo.toml","line":64,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3526}],"down_context":[],"flag":"","start":942,"end":942,"inode":{"change":7,"pos":196374}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:942"}}]}},{"SolveOrderConflict":{"inode":{"change":7,"pos":37},"path":"oldshell.nix","line":17,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":9}],"down_context":[{"change":5,"pos":802}],"flag":"","start":943,"end":943,"inode":{"change":7,"pos":37}}},"contents":[{"Add":{"text":"","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:943"}}]}},{"Edit":{"inode":{"change":7,"pos":37},"path":"oldshell.nix","line":23,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":951},"to":{"change":5,"start":951,"end":960},"introduced_by":5}],"inode":{"change":7,"pos":37}}},"contents":[{"Del":{"text":" wine","pos":"QPVP5D7LLFO5GJ7ULHFNQRG3HSZ5V65WMHS7YFTDGDFD7ZJQ2ENQC:959"}}]}},{"Edit":{"inode":{"change":7,"pos":19},"path":"libpijul/src/text_encoding.rs","line":62,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":919},"to":{"change":3,"start":0,"end":434},"introduced_by":3}],"inode":{"change":7,"pos":19}}},"contents":[{"Del":{"text":"","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:0"}},{"Del":{"text":"impl<'de> Visitor<'de> for EncodingVisitor {","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:45"}},{"Del":{"text":" type Value = Encoding;","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:72"}},{"Del":{"text":"","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:73"}},{"Del":{"text":" fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:146"}},{"Del":{"text":" formatter.write_str(\"a string label meeting the encoding standard https://encoding.spec.whatwg.org/#concept-encoding-get\")","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:277"}},{"Del":{"text":" }","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:283"}},{"Del":{"text":"","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:284"}},{"Del":{"text":" fn visit_str(self, v: &str) -> Result","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:345"}},{"Del":{"text":" where","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:355"}},{"Del":{"text":" E: serde::de::Error,","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:384"}},{"Del":{"text":" {","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:390"}},{"Del":{"text":" Ok(Encoding::for_label(v))","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:425"}},{"Del":{"text":" }","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:431"}},{"Del":{"text":"}","pos":"EXBXD3UIERNPLPDCWFE4WP4UENORKTPHUI332DVHUHN5MSLTLJWQC:433"}}]}},{"Replacement":{"inode":{"change":7,"pos":824013},"path":"libpijul/src/changestore/filesystem.rs","line":93,"ins":{"up_context":[{"change":7,"pos":825893}],"down_context":[{"change":7,"pos":825954}],"flag":"BLOCK","start":944,"end":1012,"inode":{"change":7,"pos":824013}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":825893},"to":{"change":7,"start":825893,"end":825954},"introduced_by":7}],"inode":{"change":7,"pos":824013}},"ins_contents":[{"Add":{"text":" fn load<'a, F: Fn(ChangeId) -> Option>(","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:993"}},{"Add":{"text":" &'a self,","pos":"VQQ23NP72KUK32D2LSTBIWXO5UV47RQAPQ4QA5B4V3EPYG4ZZ5WAC:1011"}}],"del_contents":[{"Del":{"text":" fn load Option>(","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:825938"}},{"Del":{"text":" &self,","pos":"SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC:825953"}}]}}],"owner":"Chasesomero","repo":"pijul","token":"dvGhsl+PZlJQYgD+jjXJ3CDbtFbtUE5fkE+duar2HUI=","login":null}

…

Dependencies

Change contents

Review