hannotify/will-git-be-around-forever - Change UXLO2KVDT7D5HJSSRWQHWAY2M6K57HWBKL45TDIXYJODEK57AB5AC

Introduce fragments

Created by Hanno Embregts on December 8, 2019

UXLO2KVDT7D5HJSSRWQHWAY2M6K57HWBKL45TDIXYJODEK57AB5AC

Dependencies

In channels

main

Change contents

Replacement in index.html at line 93 [5.29501907]

B:BD[4.4216673] → [4.4216673:4216723]

							<li>"Beyond Git" (by Paweł Świątkowski)

[4.4216595]

[4.4216723]

							<li class="fragment fade-in-then-semi-out">"Beyond Git" (by Paweł Świątkowski)

Replacement in index.html at line 96 [5.29501907]

B:BD[4.4216864] → [4.4216864:4216920]

							<li>"Merging, patches and Pijul" (by Joe Neeman)

[4.4216864]

[4.4216920]

							<li class="fragment fade-in-then-semi-out">"Merging, patches and Pijul" (by Joe Neeman)

Replacement in index.html at line 99 [5.29501907]

B:BD[4.4217037] → [6.1:31]

							<li>"The Pijul Manual"

[4.4217037]

[6.31]

							<li class="fragment fade-in-then-semi-out">"The Pijul Manual"

Insertion in sections/0-welcome.md at line 27 [8.462]
[2.192]
[7.34]
```
* Niet te snel praten!! Er is tijd genoeg!
```

Replacement in sections/1-preface.md at line 75 [10.11858]

B:BD[9.40015] → [9.40015:40103]

∅:D[9.40103] → [4.4220357:4220450]

B:BD[4.4220357] → [4.4220357:4220450]

And his question proved that he had noticed an **entirely** different thing than I had.
Moreover, his 'discovery' - if you will - proved to be a **lot** more interesting than mine.

[9.40015]

[11.120781]

And her question proved that she had noticed an **entirely** different thing than I had.
Moreover, her 'discovery' - if you will - actually proved to be a **lot** more interesting than mine.

Replacement in sections/1-preface.md at line 78 [10.11858]

B:BD[11.120782] → [4.4220451:4220551]

He came up to me and said: "Git is great and all that, but what's gonna be the **next** big thing?"

[11.120782]

[9.40104]

She came to me after class and said: "Git is great and all that, but what's gonna be the **next** big thing?"

Replacement in sections/1-preface.md at line 84 [10.11858]

B:BD[11.121419] → [9.40480:40540]

Now I turned to the student and told him everything I knew.

[11.121419]

[9.40540]

Now I turned to the student and told her everything I knew.

Replacement in sections/1-preface.md at line 86 [10.11858]
B:BD[9.40662] → [9.40662:40702]
```
But this wasn't a proper answer at all!
```
[9.40662]
[9.40702]
```
But of course this wasn't a proper answer at all!
```

Replacement in sections/1-preface.md at line 89 [10.11858]

B:BD[11.121424] → [9.40767:40976]

Now afterwards, I really felt bad about not being able to answer his question directly.
I had effectively told the guy that "Git will probably be around forever", even if I didn't phrase it exactly like that.

[11.121424]

[9.40976]

Now afterwards, I really felt bad about not being able to answer my student's question directly.
I had effectively told her that "Git will probably be around forever", even if I didn't phrase it exactly like that.

Replacement in sections/1-preface.md at line 94 [10.11858]
∅:D[4.4221576] → [8.3420:3465]
B:BD[8.3420] → [8.3420:3465]
```
Which is the one you're attending right now!
```
[4.4221576]
[8.3465]
```
Which is the one you're attending right now! 
```

Replacement in sections/1-preface.md at line 98 [10.11858]

B:BD[9.41114] → [9.41114:41197]

And after we find out, I'll make sure that he gets the answer as soon as possible.

[9.41114]

[9.41197]

And after we find out, I'll make sure that she gets the answer as soon as possible.

Replacement in sections/1-preface.md at line 116 [10.11858]

B:BD[12.95657] → [13.7966857:7966949]

If working in software development for almost 12 years has taught me anything, it's that...

[12.95657]

[14.974101]

Boy, was he wrong!
If working in software development for over 12 years has taught me anything, it's that...

Replacement in sections/2-git.md at line 27 [10.11907]

B:BD[4.4222819] → [4.4222819:4222891]

* Distributed
* Free &amp; open-source
* Fast
* Optimized for branching

[4.4222819]

[4.4222891]

* Distributed <!-- .element: class="fragment fade-in-then-semi-out" -->
* Free &amp; open-source <!-- .element: class="fragment fade-in-then-semi-out" -->
* Fast <!-- .element: class="fragment fade-in-then-semi-out" -->
* Optimized for branching <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/2-git.md at line 41 [10.11907]

∅:D[9.42494] → [4.4223245:4223365]

B:BD[4.4223245] → [4.4223245:4223365]

* **Optimized for branching** 
  * In the Subversion age, developers 'were afraid of branching', so they didn't do it!

[9.42494]

[4.4223365]

* **Optimized for branching**
  * Like Subversion, Git has 'easy branching'.
  * In the CVS age, developers 'were afraid of branching', so they didn't do it!

Replacement in sections/3-the-browser-wars.md at line 23 [8.3908]

B:BD[8.5025] → [4.4232194:4232242]

Now notice the date, in the bottom left corner.

[8.5025]

[4.4232242]

It's in Dutch, but obviously that's not the worst thing.
Firstly, notice the date, in the bottom left corner.

Replacement in sections/3-the-browser-wars.md at line 30 [8.3908]

B:BD[8.5140] → [9.49538:49652]

∅:D[9.49652] → [8.5165:5196]

B:BD[8.5165] → [8.5165:5196]

Which were present on **every** slide.
They were obviously a major waste of space.
Also: the background gradient.
The page number at the bottom.

[8.5140]

[9.49653]

Which were repeated on **every** slide. 
Disastrous!
Major waste of space.
 
Also: the background gradient. 
What is up with that?
Nobody uses that any more.
The page numbers  at the bottom.

Replacement in sections/3-the-browser-wars.md at line 41 [8.3908]

B:BD[9.49722] → [9.49722:49786]

If you just wait for fifteen years, they will be popular again.

[9.49722]

[9.49786]

If you would just wait another  fifteen years, they will be popular again.

Replacement in sections/3-the-browser-wars.md at line 120 [8.3908]

B:BD[9.50737] → [9.50737:50862]

Also, if more people know your product, then in theory they can come up with fresh new ideas that your product doesn't have.

[9.50737]

[9.50862]

Also, if more people know your product, then in theory there are more people that can come up with fresh new ideas that your product doesn't have.

Replacement in sections/4-four-new-kids-on-the-block.md at line 12 [13.7971395]
B:BD[15.2744706] → [3.2:36]
```
## Four new(er) kids on the block
```
[15.2744706]
[13.7971659]
```
## Three new(er) kids on the block
```
Deletion in sections/4-four-new-kids-on-the-block.md at line 14 [13.7971395]
B:BD[13.7971665] → [13.7971665:7971681]
```
* Fossil (2006)
```
Replacement in sections/4-four-new-kids-on-the-block.md at line 15 [13.7971395]
B:BD[13.7971698] → [6.218:236]
```
* Veracity (2011)
```
[13.7971698]
[13.7971716]
```
* Fossil (2006)
```

Replacement in sections/4-four-new-kids-on-the-block.md at line 19 [13.7971395]

B:BD[13.7971739] → [9.51539:51664]

These four Version Control Systems have been published after the large Distributed Version Control wave in March/April 2005.

[13.7971739]

[9.51664]

These three Version Control Systems have been published after the large Distributed Version Control wave in March/April 2005.

Deletion in sections/4-four-new-kids-on-the-block.md at line 25 [13.7971395]

∅:D[9.51995] → [6.237:243]

B:BD[15.2744861] → [6.237:243]

B:BD[6.243] → [9.51996:52015]

∅:D[9.52015] → [6.254:330]

B:BD[6.254] → [6.254:330]

B:BD[6.330] → [9.52016:52098]

∅:D[9.52098] → [6.364:582]

B:BD[6.364] → [6.364:582]

B:BD[6.582] → [9.52099:52179]


---
## Veracity (2011)
* Distributed version control
* Issue tracking and wiki, also distributed
![Veracity logo](img/logos/veracity.png) <!-- .element: class="no-background" -->
<http://www.veracity-scm.com> <!-- .element: class="attribution" -->
---
## But
#### Veracity is not going to be 'the Git killer'
* Development status: web site appears unmaintained; latest release March 25, 2013	
* Hosting platform www.onveracity.com hasn't been online since February 4, 2015

Deletion in sections/4-four-new-kids-on-the-block.md at line 26 [13.7971395]

B:BD[6.659] → [6.659:665]

B:BD[6.665] → [9.52180:52518]

∅:D[6.762] → [4.4234785:4234786]

∅:D[9.52518] → [4.4234785:4234786]

∅:D[15.2744861] → [4.4234785:4234786]

B:BD[4.4234785] → [4.4234785:4234786]

note:
Sorry if this is a bit of an anti-climax.
But in the talk abstract I included Veracity as one of the contenders.
And when I wrote the abstract I never thought about the fact that it could disappear from the Internet altogether.
Because that's literally what happened.
But no worries, I've found a replacement contender!
Which is Plastic.

Replacement in sections/4-four-new-kids-on-the-block.md at line 30 [13.7971395]

B:BD[15.2744863] → [15.2744863:2744964]

* Fast branching
* Merge previews
* Both central and distributed
* Comes with **a lot** of GUI stuff

[15.2744863]

[4.4234830]

* Fast branching <!-- .element: class="fragment fade-in-then-semi-out" -->
* Merge previews <!-- .element: class="fragment fade-in-then-semi-out" -->
* Both central and distributed <!-- .element: class="fragment fade-in-then-semi-out" -->
* Comes with a lot of GUI stuff <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/4-four-new-kids-on-the-block.md at line 47 [13.7971395]

B:BD[15.2745184] → [15.2745184:2745281]

B:BD[15.2745281] → [9.52600:52664]

* 'Plastic Gluon' is a version control component meant for artists and designers
* Image diffing
* References on their website are exclusively from game studios

[15.2745184]

[4.4234908]

* 'Plastic Gluon' is a version control component meant for artists and designers <!-- .element: class="fragment fade-in-then-semi-out" -->
* Image diffing <!-- .element: class="fragment fade-in-then-semi-out" -->
* References on their website are exclusively from game studios <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/4-four-new-kids-on-the-block.md at line 62 [13.7971395]

B:BD[15.2745643] → [6.763:795]

B:BD[6.795] → [9.52665:52730]

* it's not open-source software
* Git users are not changing their VCS just for some *eye candy*

[15.2745643]

[15.2745732]

* it's not open-source software <!-- .element: class="fragment fade-in-then-semi-out" -->
* Git users are not changing their VCS just for some eye candy <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/5-fossil.md at line 17 [10.12102]

B:BD[4.4235404] → [6.797:937]

B:BD[6.937] → [9.52893:52930]

∅:D[9.52930] → [6.973:1035]

B:BD[6.973] → [6.973:1035]

* **distributed** version control
* **integrated bug tracking**, wiki, forum and technotes
* built-in **web interface**
* **autosync** mode
* show **descendants** of a check-in
* supports operations on multiple repositories (`fossil all`)

[4.4235404]

[6.1035]

<ul>
    <li class="fragment fade-in-then-semi-out">distributed version control</li>
    <li class="fragment fade-in-then-semi-out">integrated bug tracking, wiki, forum and technotes</li>
    <li class="fragment fade-in-then-semi-out">built-in web interface</li>
    <li class="fragment fade-in-then-semi-out">autosync mode</li>
    <li class="fragment fade-in-then-semi-out">show descendants of a check-in</li>
    <li class="fragment fade-in-then-semi-out">supports operations on multiple repositories (<code>fossil all</code>)</li>
</ul>

Replacement in sections/5-fossil.md at line 26 [10.12102]

B:BD[6.1036] → [6.1036:1103]

<https://www.fossil-scm.org> <!-- element: class="attribution" -->

[6.1036]

[6.1103]

<a href="https://www.fossil-scm.org" class="attribution">https://www.fossil-scm.org</a>

Replacement in sections/5-fossil.md at line 35 [10.12102]

B:BD[4.4235459] → [6.1191:1304]

* Written in C and SQL
* Is the VCS of choice for the SQLite project
* 'Github in a box'
* Free code hosting at:

[4.4235459]

[6.1304]

* Written in C and SQL <!-- .element: class="fragment fade-in-then-semi-out" -->
* Is the VCS of choice for the SQLite project <!-- .element: class="fragment fade-in-then-semi-out" -->
* 'Github in a box' <!-- .element: class="fragment fade-in-then-semi-out" -->
* Free code hosting at: <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/5-fossil.md at line 51 [10.12102]

B:BD[6.1618] → [9.52995:53160]

* a repository is stored in a single SQLite database file
* contains relations between check-ins to be able to produce both ancestors and descendants of a check-in

[6.1618]

[6.2054]

* a repository is stored in a single SQLite database file <!-- .element: class="fragment fade-in-then-semi-out" -->
* contains relations between check-ins to be able to produce both ancestors and descendants of a check-in <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/5-fossil.md at line 65 [10.12102]

B:BD[6.2776] → [9.53445:53475]

∅:D[9.53475] → [16.158:246]

B:BD[16.158] → [16.158:246]

* repository UI (`fossil ui`)
* wiki, ticketing &amp; bug tracking
* embedded documentation
* technical notes
* forum

[6.2776]

[4.4235472]

<ul>
    <li class="fragment fade-in-then-semi-out">repository UI (<code>fossil ui</code>)</li>
    <li class="fragment fade-in-then-semi-out">wiki, ticketing &amp; bug tracking</li>
    <li class="fragment fade-in-then-semi-out">embedded documentation</li>
    <li class="fragment fade-in-then-semi-out">technical notes</li>
    <li class="fragment fade-in-then-semi-out">forum</li>
</ul>

Deletion in sections/5-fossil.md at line 89 [10.12102]
∅:D[6.4420] → [4.4235601:4235623]
B:BD[4.4235601] → [4.4235601:4235623]
```
* Resolving conflicts
```

Replacement in sections/6-pijul.md at line 25 [10.12149]

B:BD[17.912] → [17.912:1076]

B:BD[17.1076] → [16.1123:1151]

* **distributed** version control
* **simple**, because of its basis on a *sound theory of patches*
* **fast**, because it aims to fix the Darcs performance issues
* **interactive** recording

[17.912]

[17.1076]

* distributed version control <!-- .element: class="fragment fade-in-then-semi-out" -->
* simple, because of its basis on a sound theory of patches <!-- .element: class="fragment fade-in-then-semi-out" -->
* fast, because it aims to fix the Darcs performance issues <!-- .element: class="fragment fade-in-then-semi-out" -->
* interactive recording <!-- .element: class="fragment fade-in-then-semi-out" -->

Replacement in sections/6-pijul.md at line 40 [10.12149]

B:BD[17.1098] → [17.1098:1150]

B:BD[17.1150] → [6.4805:4853]

* written in Rust
* *bootstrapped* since April 2017
* free code hosting at <https://nest.pijul.com>

[17.1098]

[17.1200]

<ul>
    <li class="fragment fade-in-then-semi-out">written in Rust
    <li class="fragment fade-in-then-semi-out">bootstrapped since April 2017
    <li class="fragment fade-in-then-semi-out">free code hosting at 
    <a href="https://nest.pijul.com">https://nest.pijul.com</a> 
</ul>

Replacement in sections/6-pijul.md at line 57 [10.12149]

B:BD[4.4236289] → [6.4854:5172]

B:BD[6.5172] → [9.53802:53913]

* A patch is an intuitive atomic unit of work.
* It focuses on *changes*, instead of *differences between snapshots* (i.e. Git commits).
* Applying or unapplying a patch *doesn't change* its identity.
* The end result of applying several patches is always the same, regardless of the order in which they were applied.
* Pijul keeps track of 'dependent patches'
* No merges or rebases; applying a patch is like `git cherry-pick`.

[4.4236289]

[6.5172]

<ul>
    <li class="fragment fade-in-then-semi-out">A patch is an intuitive atomic unit of work.</li>
    <li class="fragment fade-in-then-semi-out">It focuses on <em>changes</em>, instead of <em>differences between snapshots</em> (i.e. Git commits).</li>
    <li class="fragment fade-in-then-semi-out">Applying or unapplying a patch <em>doesn't change</em> its identity.</li>
    <li class="fragment fade-in-then-semi-out">The end result of applying several patches is always the same, regardless of the order in which they were applied.</li>
    <li class="fragment fade-in-then-semi-out">Pijul keeps track of 'dependent patches'</li>
    <li class="fragment fade-in-then-semi-out">No merges or rebases; applying a patch is like <code>git cherry-pick</code>.</li>
</ul>

Replacement in sections/6-pijul.md at line 82 [10.12149]

B:BD[16.1330] → [16.1330:1494]

    pijul init demo
    touch Sample.java
    pijul status
    pijul add Sample.java
    mkdir directory
    pijul add directory
    pijul status
    pijul record

[16.1330]

[16.1494]

    `pijul init demo`
    `touch Sample.java`
    `pijul status`
    `pijul add Sample.java`
    `mkdir directory`
    `pijul add directory`
    `pijul status`
    `pijul record `

Replacement in sections/6-pijul.md at line 91 [10.12149]

B:BD[16.1495] → [16.1495:1759]

    (Here y means yes, n means no, k means undo and remake last decision, a means include this and all remaining patches, d means include neither this patch nor the remaining patches and i means ignore this file locally (i.e. it is added to .pijul/local/ignore).)

[16.1495]

[16.1759]

    (Here `y` means yes, `n` means no, `k` means undo and remake last decision, `a` means include this and all remaining patches, `d` means include neither this patch nor the remaining patches and `i` means ignore this file locally (i.e. it is added to .pijul/local/ignore).)

Replacement in sections/7-predictions.md at line 19 [10.12245]

B:BD[17.1937] → [4.4236982:4237029]

B:BD[4.4237029] → [18.331324:331357]

∅:D[18.331357] → [4.4237029:4237073]

B:BD[4.4237029] → [4.4237029:4237073]

* Killer features.
* Hosting platform support.
* Open-source community support.
* The disadvantage of the dominant product.

[4.4236926]

[17.2061]

* Killer features. <!-- .element: class="fragment fade-in-then-semi-out" -->
* Hosting platform support. <!-- .element: class="fragment fade-in-then-semi-out" -->
* Open-source community support. <!-- .element: class="fragment fade-in-then-semi-out" -->
* The disadvantage of the dominant product. <!-- .element: class="fragment fade-in-then-semi-out" -->