Finish first section

[?]

Sep 28, 2022, 11:49 AM

5FJPILYNAWSUUZNSG3AWSX6U3X7ECZZVTD5TQ2YICCFCSOFR7AEQC

Dependencies

[2] SAYGZU3I Add the Pijul section of the Successors talk
[3] IEJDYQSW Initial commit
[4] P3PI25SN Add a few sections

Change contents

edit in README.md at line 8

[3.189]

[3.189]

## Program & target times
edit in README.md at line 11

[3.190]

| Section | Target time | Duration |
|---|---|---|
| Dang it, Git & welcome | 0:00 | 2:00 |
| Introducing Pijul | 2:00 | 4:00 |
| Demo | 6:00 | 8:00 |
| Comparison | 14:00 | 1:00 |
| Wrap-up | 15:00 | 0:00 |
file addition: docker (d--r------)

[3.2]
file addition: Dockerfile (----------)

[0.243]

FROM rust:latest
RUN apt-get update
RUN apt-get install -y make libsodium-dev libclang-dev pkg-config libssl-dev libxxhash-dev libzstd-dev clang

# install pijul
RUN cargo install pijul --version "~1.0.0-beta" --features git
RUN export PATH="\$PATH:$HOME/.cargo/bin/"

# install vim
RUN apt-get install -y vim

RUN mkdir /development
edit in index.html at line 34

[3.163534478]→[3.163534478:163534656](∅→∅)

<section data-markdown="sections/0-welcome.md" data-separator="^\r?\n------\r?\n$"
data-separator-vertical="^\r?\n---\r?\n$">
</section>
replacement in index.html at line 35

[3.163534657]→[3.1:100](∅→∅)

<section data-markdown="sections/1-dang-it-git.md" data-separator="^\r?\n------\r?\n$"

[3.163534657]

[3.100]

<section data-markdown="sections/1-dang-it-git-and-welcome.md" data-separator="^\r?\n------\r?\n$"
file deletion: 1-dang-it-git.md (----------)

[3.163536244]→[3.841:881](∅→∅),[3.881]→[3.824:824](∅→∅)

# Dang it, Git!

file deletion: 0-welcome.md (----------)

[3.163536244]→[3.163537903:163537939](∅→∅),[3.163537939]→[3.163537313:163537313](∅→∅)

### A Birds-Eye View of Version Control with
# Pijul

<table>
<tr>
<td style="vertical-align: middle;">Hanno Embregts</td>
<td style="text-align: right;"><img width="20%" data-src="img/icons/twitter-white.png" class="no-background"/></td>
<td style="vertical-align: middle; padding: 0 0 0 0"><a href="https://www.twitter.com/hannotify">@hannotify</a></td>
</tr>
</table>
<img data-src="img/logos/frontmania.png" width="25%" class="no-background"/>
<br/>

note:

*Voorbereidingen*:

* ...

Hi, my name is Hanno.
I work at Info Support as an IT consultant.
file deletion: 0-welcome.md (----------)

[3.163536244]→[3.163538531:163538567](∅→∅),[3.163538567]→[3.163537941:163537941](∅→∅)

### A Birds-Eye View of Version Control with
# Pijul

<table>
<tr>
<td style="vertical-align: middle;">Hanno Embregts</td>
<td style="text-align: right;"><img width="20%" data-src="img/icons/twitter-white.png" class="no-background"/></td>
<td style="vertical-align: middle; padding: 0 0 0 0"><a href="https://www.twitter.com/hannotify">@hannotify</a></td>
</tr>
</table>
<img data-src="img/logos/frontmania.png" width="25%" class="no-background"/>
<br/>

note:

*Voorbereidingen*:

* ...

Hi, my name is Hanno.
I work at Info Support as an IT consultant.
file addition: 1-dang-it-git-and-welcome.md (----------)

[3.163536244]

### A Birds-Eye View of Version Control with
# Pijul

<table>
<tr>
<td style="vertical-align: middle;">Hanno Embregts</td>
<td style="text-align: right;"><img width="20%" data-src="img/icons/twitter-white.png" class="no-background"/></td>
<td style="vertical-align: middle; padding: 0 0 0 0"><a href="https://www.twitter.com/hannotify">@hannotify</a></td>
</tr>
</table>
<img data-src="img/logos/frontmania.png" width="25%" class="no-background"/>
<br/>

note:

*Voorbereidingen*:

* TODO

Hi, my name is Hanno.
I work at Info Support as an IT consultant.
And this talk is about Pijul, a version control system that could perhaps be an alternative to Git.

---



# Yay,
# Git!

note:

Quick show of hands - who of you is currently using Git?
And who uses a different version control system?

There's a lot to like about Git:

* easy branching
* fast
* distributed nature (open-source development, work offline)

But do we like everything?
Do we like...

* amending commits? (or changing the message)
* committing to the wrong branch and having to fix it?
* running a diff when nothing happens?
* conflicts when merging or rebasing?
* getting the same conflicts multiple times when dealing with long-lived branches?
* fresh clones because the repo is too messed up to repair?
* heated team debates on rebase vs. merge?

---



# Dang it,
# Git!

[dangitgit.com](https://dangitgit.com) 

note:

Some days it's more like "Dang it, Git!" instead of "Yay, Git!"
There's a website for that, by the way. (slide)

To summarise, I don't always like:

* the documentation
* features we often need are buried in some obscure command-line argument
* Git's snapshot-based approach when changes travel
* rebasing or cherry-picking changes commit identities
* there's no way to fix a commit once and for all (`git rerere`)

But, you know, as long as there isn't something better available, it'll probably be fine, right?

---

# Teaching a Git course



<http://blog.plasticscm.com/2010/11/version-control-timeline.html> 

note:

In fact, this is what I always say when teaching people about Git.
This chart is from the Git course I regularly teach at Info Support.
Sure enough, after 2005-2006, nothing seems to have happened in version control world.

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.
She said: "I like Git well enough, but what is new and cool in version control?"

And because I didn't know the answer to her question, I started researching it and found a few newer version control systems.
They were called Fossil and Pijul.
This talk is about Pijul, and how its approach is different from Git's approach.
edit in sections/2-introducing-pijul.md at line 20

[2.823]

[2.823]

note:
edit in sections/2-introducing-pijul.md at line 23

[2.824]

[2.824]

So let's address the name first.
...
replacement in sections/3-demo.md at line 78

[2.4869]→[2.4869:5524](∅→∅)

Previous version of the talk I used v0.12, which was clearly labeled as a preview version for research purposes.
v1.0 uses a complete rewrite of the patch format, amongst other things.

A 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.
After some time a solution was found, but it meant that a new patch format was needed, along with a few new algorithms.
So, Pijul had to be rewritten from scratch to make it all work, which obviously resulted in a lot of breaking changes.

It is now feature-complete and it will be backwards-compatible from now on.

[2.4869]

[2.5524]

Pijul is now feature-complete and it will be backwards-compatible from now on.
replacement in sections/4-comparison.md at line 3

[2.5873]→[3.997:1009](∅→∅),[3.996]→[3.997:1009](∅→∅)

# Comparison

[2.5873]

# Comparison

* Tabel die features met Git vergelijken
edit in sections/a-wrap-up.md at line 3

[2.6009]

[2.6009]

## When To (Not) Use Pijul
edit in sections/a-wrap-up.md at line 6

[2.6010]

[3.163536313]

<section>
<h2>Now what?</h2>
<ul>
<li class="fragment">Git's snapshotting might be too technical for the average user. <strong>So try Pijul for a change!</strong></li>
</ul>
<aside class="notes">
<strong>Time Elapsed: 15 min.</strong>

1. A lot of students in my "Git for developers" course are managers, test specialists, requirements engineers, Scrum Masters. And they struggle with Git's snapshot-based approach. Perhaps a patch-based approach like Pijul will suit them better.
</section>