pijul nest
guest › [sign in] [explore]

Update slide deck for FrontMania

[?]
Cu8k8BfrvNwDkRWU83tkpGRWc3EeoBWfYneKhy21AVvp
Oct 3, 2022, 7:15 PM
PIJ65A3SWCD43EFTNISSPMS5OVY6OLESLMBUK2TFUHT2G4NUDMLQC

Dependencies

Change contents

  • file deletion: java (d--r------)
    [4.2]→[4.2:17](∅→∅),[4.17]→[4.1:1](∅→∅)
  • file deletion: javascript (d--r------)
    [4.2]→[3.3872:3893](∅→∅),[3.3893]→[3.3894:3894](∅→∅)
  • edit in sections/6-pijul.md at line 60
    [20.1427]
    [4.4236288]
  • replacement in sections/6-pijul.md at line 68
    [4.6213]→[3.144:293](∅→∅)
    <li class="fragment fade-in-then-semi-out">No rebases, and merges are hardly needed; applying a patch is like <code>git cherry-pick</code>.</li>
    [4.6213]
    [4.6342]
    <li class="fragment fade-in-then-semi-out">Rebase and merge don't exist, applying a patch (and its dependencies) is like <code>git cherry-pick</code>.</li>
  • edit in sections/6-pijul.md at line 72
    [21.5179]
    [4.2210]
    Let's zoom in on this "patch-oriented design".
    [walk through the bullet list]
    [on **identity**]
  • edit in sections/6-pijul.md at line 79
    [4.689303]
    [4.689303]
    In Git each snapshot has its own identity.
    [on **order**]
    Changes in Pijul can be applied in any order. This is great for cherry-picking: Pijul knows the changes that need to come along, and maintains the identity of the change after the cherry-pick. No need to manually find the commits to revert or pick.
    [on **rebase** and **merges**]
    One particular goal of Pijul is to model conflicts as normal states of collaboration, so that conflicts are resolved by normal changes, valid even for the same conflicts in any other context.
    It is important to note that conflicts in Pijul always happen between changes, for example we might say that “change A conflicts with change B”. A conflict resolution is always a change.
  • edit in sections/6-pijul.md at line 89
    [4.689304]
    [4.689304]
    One of the main features of Pijul is that its internal representation of repositories fully models conflicts. Patches can even be applied to a conflicting repository, leaving the conflict resolution for later.
  • edit in sections/6-pijul.md at line 96
    [4.689539]
    [20.1427]
    ---
    ## If commits were bank transactions
    <table>
    <tr>
    <th/>
    <th>snapshot</th>
    <th>patch</th>
    </tr>
    <tr class="fragment">
    <th align="right">initial balance</th>
    <td align="right"><code>100</code></td>
    <td align="right"><code>+100</code></td>
    </tr>
    <tr class="fragment">
    <th align="right">salary</th>
    <td align="right"><code>400</code></td>
    <td align="right"><code>+300</code></td>
    </tr>
    <tr class="fragment">
    <th align="right">heating</th>
    <td align="right"><code>0</code></td>
    <td align="right"><code>-400</code></td>
    </tr>
    </table>
  • edit in sections/6-pijul.md at line 124
    [20.1428]
    [20.1428]
    note:
    Snapshots store account balance, patches store deltas.
    Which means patch order doesn't matter for the final result.
  • edit in sections/5-fossil.md at line 99
    [3.863]
    [22.535]
    ---
  • replacement in sections/0-welcome.md at line 11
    [2.10103]→[2.10103:10181](∅→∅)
    <img data-src="img/logos/future-tech.png" width="15%" class="no-background"/>
    [2.10103]
    [2.10181]
    <img data-src="img/logos/frontmania.png" width="25%" class="no-background"/>
  • replacement in sections/0-welcome.md at line 40
    [3.3724]→[3.3724:3776](∅→∅)
    (and who doesn't like these handraising questions?)
    [3.3724]
    [3.3776]
    (and who doesn't like these stupid handraising questions?)
  • replacement in index.html at line 20
    [4.614]→[2.9510:9577](∅→∅)
    <link rel="stylesheet" href="css/future-tech.css" id="custom">
    [4.614]
    [4.676]
    <link rel="stylesheet" href="css/frontmania.css" id="custom">
  • edit in index.html at line 88
    [4.3751]→[4.3751:3781](∅→∅),[4.3781]→[4.688550:688646](∅→∅),[4.688646]→[4.3867:3911](∅→∅),[4.3867]→[4.3867:3911](∅→∅),[4.3911]→[4.688647:688796](∅→∅)
    </li>
    <li class="fragment fade-in-then-semi-out">Try out Pijul @ katacoda.com
    <br /><small><a
    href="https://www.katacoda.com/ysndr/scenarios/pijul">https://www.katacoda.com/ysndr/scenarios/pijul</a></small>
  • replacement in index.html at line 160
    [4.6859519]→[2.9578:9666](∅→∅)
    <a href="https://twitter.com/hannotify">#FutureTech #SuccessorOfGit</a>
    [4.6859519]
    [4.6859605]
    <a href="https://twitter.com/hannotify">#FrontMania #SuccessorOfGit</a>
  • edit in README.md at line 12
    [2.20]
    ## Program & target times
    | Section | Target time | Duration |
    |---|---:|---:|
    | Welcome | 0:00 | 3:00 |
    | Preface | 3:00 | 5:00 |
    | Git | 8:00 | 5:00 |
    | The browser wars | 13:00 | 4:00 |
    | New kids on the block | 17:00 | 1:00 |
    | Fossil | 18:00 | 9:00 |
    | Pijul | 27:00 | 13:00 |
    | Predictions | 40:00 | 15:00 |
    | Wrap-up | 45:00 | 0:00 |