{"header":{"message":"Finish first section","description":null,"timestamp":"2022-09-28T11:49:13Z","authors":[{"email":"hanno.embregts@infosupport.com","name":"Hanno Embregts"}]},"hash":"5FJPILYNAWSUUZNSG3AWSX6U3X7ECZZVTD5TQ2YICCFCSOFR7AEQC","authors":[],"deps":{"hashes":[["5FJPILYNAWSUUZNSG3AWSX6U3X7ECZZVTD5TQ2YICCFCSOFR7AEQC","Finish first section"],["AA",null],["SAYGZU3IYYSTVWCTESGOLUFPD5RYOZ3OPF2GMBSETYLEUYI33MWAC","Add the Pijul section of the Successors talk"],["IEJDYQSWFL4L73DUWIBDNIPKD4OANRP5K3NDGEDM6FSMIDHKWLBQC","Initial commit"],["P3PI25SNXZTWEGRXTURJKBVUW6KMV7QJ6P5RYT2FILNCLBPCA6AAC","Add a few sections"]],"deps":["SAYGZU3IYYSTVWCTESGOLUFPD5RYOZ3OPF2GMBSETYLEUYI33MWAC"],"known":["IEJDYQSWFL4L73DUWIBDNIPKD4OANRP5K3NDGEDM6FSMIDHKWLBQC","P3PI25SNXZTWEGRXTURJKBVUW6KMV7QJ6P5RYT2FILNCLBPCA6AAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":51},"path":"README.md","line":8,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":189}],"down_context":[{"change":3,"pos":189}],"flag":"BLOCK","start":1,"end":28,"inode":{"change":3,"pos":51}}},"contents":[{"Add":""},{"Add":"## Program & target times"}]}},{"Edit":{"inode":{"change":3,"pos":51},"path":"README.md","line":11,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":190}],"down_context":[],"flag":"BLOCK","start":29,"end":241,"inode":{"change":3,"pos":51}}},"contents":[{"Add":"| Section | Target time | Duration |"},{"Add":"|---|---|---|"},{"Add":"| Dang it, Git & welcome | 0:00 | 2:00 |"},{"Add":"| Introducing Pijul | 2:00 | 4:00 |"},{"Add":"| Demo | 6:00 | 8:00 |"},{"Add":"| Comparison | 14:00 | 1:00 | "},{"Add":"| Wrap-up | 15:00 | 0:00 | "},{"Add":""},{"Add":""}]}},{"FileAdd":{"meta":{"basename":"docker","metadata":576},"context":[{"change":3,"pos":2}],"contents":[]}},{"FileAdd":{"meta":{"basename":"Dockerfile","metadata":0},"context":[{"change":0,"pos":243}],"contents":[{"Add":"FROM rust:latest"},{"Add":"RUN apt-get update"},{"Add":"RUN apt-get install -y make libsodium-dev libclang-dev pkg-config libssl-dev libxxhash-dev libzstd-dev clang"},{"Add":""},{"Add":"# install pijul"},{"Add":"RUN cargo install pijul --version \"~1.0.0-beta\" --features git"},{"Add":"RUN export PATH=\"\\$PATH:$HOME/.cargo/bin/\""},{"Add":""},{"Add":"# install vim"},{"Add":"RUN apt-get install -y vim"},{"Add":""},{"Add":"RUN mkdir /development"}]}},{"Edit":{"inode":{"change":3,"pos":163533327},"path":"index.html","line":34,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":163534478},"to":{"change":3,"start":163534478,"end":163534656},"introduced_by":3}],"inode":{"change":3,"pos":163533327}}},"contents":[{"Del":"\n

\n"}]}},{"Replacement":{"inode":{"change":3,"pos":163533327},"path":"index.html","line":35,"ins":{"up_context":[{"change":3,"pos":163534657}],"down_context":[{"change":3,"pos":100}],"flag":"BLOCK","start":635,"end":746,"inode":{"change":3,"pos":163533327}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":163534657},"to":{"change":3,"start":1,"end":100},"introduced_by":3}],"inode":{"change":3,"pos":163533327}},"ins_contents":[{"Add":"

\n\n"}]}},{"FileDel":{"deleted_names":[{"basename":"0-welcome.md","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":163536244},"to":{"change":3,"start":163537903,"end":163537939},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":163537939},"to":{"change":3,"start":163537313,"end":163537313},"introduced_by":3}],"inode":{"change":3,"pos":163537313}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":163537313},"to":{"change":3,"start":163537314,"end":163537902},"introduced_by":3}],"inode":{"change":3,"pos":163537313}},"content":[{"Del":"### A Birds-Eye View of Version Control with\n# Pijul\n\n\n \n \n \n \n \n

Hanno Embregts

@hannotify

\n
\n\nnote:\n\n*Voorbereidingen*:\n\n* ...\n\nHi, my name is Hanno. \nI work at Info Support as an IT consultant.\n"}]}},{"FileDel":{"deleted_names":[{"basename":"0-welcome.md","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":163536244},"to":{"change":3,"start":163538531,"end":163538567},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":163538567},"to":{"change":3,"start":163537941,"end":163537941},"introduced_by":3}],"inode":{"change":3,"pos":163537941}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":163537941},"to":{"change":3,"start":163537942,"end":163538530},"introduced_by":3}],"inode":{"change":3,"pos":163537941}},"content":[{"Del":"### A Birds-Eye View of Version Control with\n# Pijul\n\n\n \n \n \n \n \n

Hanno Embregts

@hannotify

\n
\n\nnote:\n\n*Voorbereidingen*:\n\n* ...\n\nHi, my name is Hanno. \nI work at Info Support as an IT consultant.\n"}]}},{"FileAdd":{"meta":{"basename":"1-dang-it-git-and-welcome.md","metadata":0},"context":[{"change":3,"pos":163536244}],"contents":[{"Add":"### A Birds-Eye View of Version Control with"},{"Add":"# Pijul"},{"Add":""},{"Add":""},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":" "},{"Add":"

Hanno Embregts

@hannotify

"},{"Add":"

"},{"Add":"
"},{"Add":""},{"Add":"note:"},{"Add":""},{"Add":"*Voorbereidingen*:"},{"Add":""},{"Add":"* TODO"},{"Add":" "},{"Add":"Hi, my name is Hanno. "},{"Add":"I work at Info Support as an IT consultant."},{"Add":"And this talk is about Pijul, a version control system that could perhaps be an alternative to Git."},{"Add":""},{"Add":"---"},{"Add":""},{"Add":""},{"Add":""},{"Add":"# Yay,"},{"Add":"# Git!"},{"Add":""},{"Add":"note:"},{"Add":""},{"Add":"Quick show of hands - who of you is currently using Git?"},{"Add":"And who uses a different version control system?"},{"Add":""},{"Add":"There's a lot to like about Git:"},{"Add":""},{"Add":"* easy branching"},{"Add":"* fast"},{"Add":"* distributed nature (open-source development, work offline)"},{"Add":""},{"Add":"But do we like everything?"},{"Add":"Do we like..."},{"Add":""},{"Add":"* amending commits? (or changing the message)"},{"Add":"* committing to the wrong branch and having to fix it?"},{"Add":"* running a diff when nothing happens?"},{"Add":"* conflicts when merging or rebasing?"},{"Add":"* getting the same conflicts multiple times when dealing with long-lived branches?"},{"Add":"* fresh clones because the repo is too messed up to repair?"},{"Add":"* heated team debates on rebase vs. merge?"},{"Add":""},{"Add":"---"},{"Add":""},{"Add":""},{"Add":""},{"Add":"# Dang it,"},{"Add":"# Git!"},{"Add":""},{"Add":"[dangitgit.com](https://dangitgit.com) "},{"Add":""},{"Add":"note:"},{"Add":""},{"Add":"Some days it's more like \"Dang it, Git!\" instead of \"Yay, Git!\""},{"Add":"There's a website for that, by the way. (slide)"},{"Add":""},{"Add":"To summarise, I don't always like:"},{"Add":""},{"Add":"* the documentation "},{"Add":" * features we often need are buried in some obscure command-line argument"},{"Add":"* Git's snapshot-based approach when changes travel"},{"Add":" * rebasing or cherry-picking changes commit identities"},{"Add":" * there's no way to fix a commit once and for all (`git rerere`)"},{"Add":""},{"Add":"But, you know, as long as there isn't something better available, it'll probably be fine, right?"},{"Add":""},{"Add":"---"},{"Add":""},{"Add":"# Teaching a Git course"},{"Add":""},{"Add":""},{"Add":""},{"Add":" "},{"Add":""},{"Add":"note:"},{"Add":""},{"Add":"In fact, this is what I always say when teaching people about Git."},{"Add":"This chart is from the Git course I regularly teach at Info Support."},{"Add":"Sure enough, after 2005-2006, nothing seems to have happened in version control world."},{"Add":""},{"Add":"In fact, I never even gave it a second thought, until a student asked me about it at the end of a particular course day."},{"Add":"She said: \"I like Git well enough, but what is new and cool in version control?\""},{"Add":""},{"Add":"And because I didn't know the answer to her question, I started researching it and found a few newer version control systems."},{"Add":"They were called Fossil and Pijul."},{"Add":"This talk is about Pijul, and how its approach is different from Git's approach."}]}},{"Edit":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":20,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":823}],"down_context":[{"change":2,"pos":823}],"flag":"BLOCK","start":4027,"end":4034,"inode":{"change":3,"pos":884}}},"contents":[{"Add":""},{"Add":"note:"}]}},{"Edit":{"inode":{"change":3,"pos":884},"path":"sections/2-introducing-pijul.md","line":23,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":824}],"down_context":[{"change":2,"pos":824}],"flag":"BLOCK","start":4035,"end":4073,"inode":{"change":3,"pos":884}}},"contents":[{"Add":"So let's address the name first."},{"Add":"..."},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":953},"path":"sections/3-demo.md","line":78,"ins":{"up_context":[{"change":2,"pos":4869}],"down_context":[{"change":2,"pos":5524}],"flag":"BLOCK","start":4075,"end":4154,"inode":{"change":3,"pos":953}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4869},"to":{"change":2,"start":4869,"end":5524},"introduced_by":2}],"inode":{"change":3,"pos":953}},"ins_contents":[{"Add":"Pijul is now feature-complete and it will be backwards-compatible from now on."}],"del_contents":[{"Del":"Previous version of the talk I used v0.12, which was clearly labeled as a preview version for research purposes.\nv1.0 uses a complete rewrite of the patch format, amongst other things.\n\nA few months after the release of Pijul 0.12, a user reported a defect regarding the unrecording of patches that were previously involved in a conflict.\nAfter some time a solution was found, but it meant that a new patch format was needed, along with a few new algorithms.\nSo, Pijul had to be rewritten from scratch to make it all work, which obviously resulted in a lot of breaking changes.\n\nIt is now feature-complete and it will be backwards-compatible from now on.\n"}]}},{"Replacement":{"inode":{"change":3,"pos":996},"path":"sections/4-comparison.md","line":3,"ins":{"up_context":[{"change":2,"pos":5873}],"down_context":[],"flag":"BLOCK","start":4156,"end":4210,"inode":{"change":3,"pos":996}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":5873},"to":{"change":3,"start":997,"end":1009},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":996},"to":{"change":3,"start":997,"end":1009},"introduced_by":3}],"inode":{"change":3,"pos":996}},"ins_contents":[{"Add":"# Comparison"},{"Add":""},{"Add":"* Tabel die features met Git vergelijken"}],"del_contents":[{"Del":"# Comparison"}]}},{"Edit":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":3,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6009}],"down_context":[{"change":2,"pos":6009}],"flag":"BLOCK","start":4212,"end":4240,"inode":{"change":3,"pos":163536312}}},"contents":[{"Add":""},{"Add":"## When To (Not) Use Pijul"}]}},{"Edit":{"inode":{"change":3,"pos":163536312},"path":"sections/a-wrap-up.md","line":6,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":6010}],"down_context":[{"change":3,"pos":163536313}],"flag":"BLOCK","start":4241,"end":4798,"inode":{"change":3,"pos":163536312}}},"contents":[{"Add":"

"},{"Add":"

Now what?

"},{"Add":"

Git's snapshotting might be too technical for the average user. So try Pijul for a change!

"},{"Add":"

"},{"Add":""}]}}],"owner":"hannotify","repo":"a-birds-eye-view-of-version-control-with-pijul","token":"f5WMRdNrubTXWrPXgI9ZtwXIkLTAZdE0bSt0PCbVdz0=","login":null}

…

Dependencies

Change contents