mirror of
https://github.com/unisonweb/unison.git
synced 2024-10-26 02:55:19 +03:00
update transcript outputs
This commit is contained in:
parent
8e8b00675f
commit
4c9deb169c
File diff suppressed because it is too large
Load Diff
@ -85,7 +85,7 @@ The `builtins.merge` command adds the known builtins to a `builtin` subnamespace
|
||||
74. Value/ (5 terms)
|
||||
75. bug (a -> b)
|
||||
76. crypto/ (15 terms, 2 types)
|
||||
77. io2/ (148 terms, 32 types)
|
||||
77. io2/ (146 terms, 32 types)
|
||||
78. metadata/ (2 terms)
|
||||
79. todo (a -> b)
|
||||
80. unsafe/ (1 term)
|
||||
|
@ -23,7 +23,7 @@ Technically, the definitions all exist, but they have no names. `builtins.merge`
|
||||
|
||||
.foo> ls
|
||||
|
||||
1. builtin/ (469 terms, 74 types)
|
||||
1. builtin/ (467 terms, 74 types)
|
||||
|
||||
```
|
||||
And for a limited time, you can get even more builtin goodies:
|
||||
@ -35,7 +35,7 @@ And for a limited time, you can get even more builtin goodies:
|
||||
|
||||
.foo> ls
|
||||
|
||||
1. builtin/ (643 terms, 92 types)
|
||||
1. builtin/ (641 terms, 92 types)
|
||||
|
||||
```
|
||||
More typically, you'd start out by pulling `base.
|
||||
|
@ -119,13 +119,13 @@ it's still in the `history` of the parent namespace and can be resurrected at an
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #bu1i0n9dc8
|
||||
⊙ 1. #720815367g
|
||||
|
||||
- Deletes:
|
||||
|
||||
feature1.y
|
||||
|
||||
⊙ 2. #5tcb95h81s
|
||||
⊙ 2. #4hps00eboc
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -136,26 +136,26 @@ it's still in the `history` of the parent namespace and can be resurrected at an
|
||||
Original name New name(s)
|
||||
feature1.y master.y
|
||||
|
||||
⊙ 3. #mnckoq3rit
|
||||
⊙ 3. #c15feh0lv3
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
feature1.y
|
||||
|
||||
⊙ 4. #p4tlcg4hum
|
||||
⊙ 4. #5k00u4h52h
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
x master.x
|
||||
|
||||
⊙ 5. #annk1i1aiq
|
||||
⊙ 5. #b3s8tvonc0
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
x
|
||||
|
||||
□ 6. #g1cc8nnehi (start of history)
|
||||
□ 6. #fdbvr2f3s3 (start of history)
|
||||
|
||||
```
|
||||
To resurrect an old version of a namespace, you can learn its hash via the `history` command, then use `fork #namespacehash .newname`.
|
||||
|
@ -80,7 +80,7 @@ Should be able to move the term, type, and namespace, including its types, terms
|
||||
1. Bar (Nat)
|
||||
2. Bar (type)
|
||||
3. Bar/ (4 terms, 1 type)
|
||||
4. builtin/ (469 terms, 74 types)
|
||||
4. builtin/ (467 terms, 74 types)
|
||||
|
||||
.> ls Bar
|
||||
|
||||
@ -145,7 +145,7 @@ bonk = 5
|
||||
|
||||
.z> ls
|
||||
|
||||
1. builtin/ (469 terms, 74 types)
|
||||
1. builtin/ (467 terms, 74 types)
|
||||
2. zonk (Nat)
|
||||
|
||||
```
|
||||
@ -188,7 +188,7 @@ bonk.zonk = 5
|
||||
|
||||
.a> ls
|
||||
|
||||
1. builtin/ (469 terms, 74 types)
|
||||
1. builtin/ (467 terms, 74 types)
|
||||
2. zonk/ (1 term)
|
||||
|
||||
.a> view zonk.zonk
|
||||
|
@ -277,7 +277,7 @@ I should be able to move the root into a sub-namespace
|
||||
|
||||
.> ls
|
||||
|
||||
1. root/ (1412 terms, 223 types)
|
||||
1. root/ (1406 terms, 223 types)
|
||||
|
||||
.> history
|
||||
|
||||
@ -286,22 +286,22 @@ I should be able to move the root into a sub-namespace
|
||||
|
||||
|
||||
|
||||
□ 1. #a8po34tuor (start of history)
|
||||
□ 1. #corns7qr1t (start of history)
|
||||
|
||||
```
|
||||
```ucm
|
||||
.> ls .root.at.path
|
||||
|
||||
1. existing/ (470 terms, 74 types)
|
||||
2. happy/ (472 terms, 75 types)
|
||||
3. history/ (470 terms, 74 types)
|
||||
1. existing/ (468 terms, 74 types)
|
||||
2. happy/ (470 terms, 75 types)
|
||||
3. history/ (468 terms, 74 types)
|
||||
|
||||
.> history .root.at.path
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #pic2513iu5
|
||||
⊙ 1. #vgp4hc72su
|
||||
|
||||
- Deletes:
|
||||
|
||||
@ -312,7 +312,7 @@ I should be able to move the root into a sub-namespace
|
||||
Original name New name
|
||||
existing.a.termInA existing.b.termInA
|
||||
|
||||
⊙ 2. #dpkar0l7eh
|
||||
⊙ 2. #hg5coa0n3k
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -324,26 +324,26 @@ I should be able to move the root into a sub-namespace
|
||||
happy.b.termInA existing.a.termInA
|
||||
history.b.termInA existing.a.termInA
|
||||
|
||||
⊙ 3. #ed8rah4ani
|
||||
⊙ 3. #pgpp3mqenr
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
existing.a.termInA existing.b.termInB
|
||||
|
||||
⊙ 4. #8esastt942
|
||||
⊙ 4. #gbun790pgn
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
history.a.termInA history.b.termInA
|
||||
|
||||
⊙ 5. #u50bign98h
|
||||
⊙ 5. #ljad7emlrb
|
||||
|
||||
- Deletes:
|
||||
|
||||
history.b.termInB
|
||||
|
||||
⊙ 6. #eunua4ftsk
|
||||
⊙ 6. #3easopbtbb
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -354,13 +354,13 @@ I should be able to move the root into a sub-namespace
|
||||
Original name New name(s)
|
||||
happy.b.termInA history.a.termInA
|
||||
|
||||
⊙ 7. #9v1fp5smbj
|
||||
⊙ 7. #bhmp53toom
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
history.a.termInA history.b.termInB
|
||||
|
||||
⊙ 8. #j6i6o027uo
|
||||
⊙ 8. #l5ncvimoh2
|
||||
|
||||
> Moves:
|
||||
|
||||
@ -370,7 +370,7 @@ I should be able to move the root into a sub-namespace
|
||||
happy.a.T.T2 happy.b.T.T2
|
||||
happy.a.termInA happy.b.termInA
|
||||
|
||||
⊙ 9. #g0773g7caj
|
||||
⊙ 9. #j0hfgeiitb
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -380,7 +380,7 @@ I should be able to move the root into a sub-namespace
|
||||
|
||||
happy.a.T.T
|
||||
|
||||
⊙ 10. #3ak6nm4g2v
|
||||
⊙ 10. #7mnjol2gir
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -392,7 +392,7 @@ I should be able to move the root into a sub-namespace
|
||||
|
||||
⠇
|
||||
|
||||
⊙ 11. #4p3p54fdb5
|
||||
⊙ 11. #plq3nk8j34
|
||||
|
||||
|
||||
```
|
||||
@ -414,26 +414,26 @@ I should be able to move a sub namespace _over_ the root.
|
||||
.> ls
|
||||
|
||||
1. b/ (3 terms, 1 type)
|
||||
2. builtin/ (469 terms, 74 types)
|
||||
2. builtin/ (467 terms, 74 types)
|
||||
|
||||
.> history
|
||||
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #dd6g9ldnd6
|
||||
⊙ 1. #li00cqteoe
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
b.T b.T.T1 b.T.T2 b.termInA
|
||||
|
||||
⊙ 2. #ripe11pmqo
|
||||
⊙ 2. #ck551mk9b5
|
||||
|
||||
- Deletes:
|
||||
|
||||
a.T a.T.T1 a.T.T2 a.termInA
|
||||
|
||||
⊙ 3. #1stj775onu
|
||||
⊙ 3. #gearhpa349
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -443,13 +443,13 @@ I should be able to move a sub namespace _over_ the root.
|
||||
|
||||
a.T.T
|
||||
|
||||
⊙ 4. #0sor1jkilb
|
||||
⊙ 4. #f1f560n79b
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
a.T a.T.T a.termInA
|
||||
|
||||
□ 5. #htl7ctb3ei (start of history)
|
||||
□ 5. #9vjjqeod4l (start of history)
|
||||
|
||||
```
|
||||
```ucm
|
||||
|
@ -63,17 +63,17 @@ y = 2
|
||||
most recent, along with the command that got us there. Try:
|
||||
|
||||
`fork 2 .old`
|
||||
`fork #gpvnq2mlbn .old` to make an old namespace
|
||||
`fork #ce6qpkdjhn .old` to make an old namespace
|
||||
accessible again,
|
||||
|
||||
`reset-root #gpvnq2mlbn` to reset the root namespace and
|
||||
`reset-root #ce6qpkdjhn` to reset the root namespace and
|
||||
its history to that of the
|
||||
specified namespace.
|
||||
|
||||
When Root Hash Action
|
||||
1. now #919gfih828 add
|
||||
2. now #gpvnq2mlbn add
|
||||
3. now #htl7ctb3ei builtins.merge
|
||||
1. now #fmdokt2dim add
|
||||
2. now #ce6qpkdjhn add
|
||||
3. now #9vjjqeod4l builtins.merge
|
||||
4. #sg60bvjo91 history starts here
|
||||
|
||||
Tip: Use `diff.namespace 1 7` to compare namespaces between
|
||||
|
@ -28,13 +28,13 @@ a = 5
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #matjo6b9c2
|
||||
⊙ 1. #5qd3km7th4
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
a
|
||||
|
||||
□ 2. #htl7ctb3ei (start of history)
|
||||
□ 2. #9vjjqeod4l (start of history)
|
||||
|
||||
.> reset 2
|
||||
|
||||
@ -47,7 +47,7 @@ a = 5
|
||||
|
||||
|
||||
|
||||
□ 1. #htl7ctb3ei (start of history)
|
||||
□ 1. #9vjjqeod4l (start of history)
|
||||
|
||||
```
|
||||
```unison
|
||||
@ -83,13 +83,13 @@ foo.a = 5
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #okc86j6fft
|
||||
⊙ 1. #1p2akhggkc
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
foo.a
|
||||
|
||||
□ 2. #htl7ctb3ei (start of history)
|
||||
□ 2. #9vjjqeod4l (start of history)
|
||||
|
||||
.> reset 1 foo
|
||||
|
||||
|
@ -13,7 +13,7 @@ Let's look at some examples. We'll start with a namespace with just the builtins
|
||||
|
||||
|
||||
|
||||
□ 1. #thnqh4ngaa (start of history)
|
||||
□ 1. #o6oig4fk7p (start of history)
|
||||
|
||||
.> fork builtin builtin2
|
||||
|
||||
@ -42,21 +42,21 @@ Now suppose we `fork` a copy of builtin, then rename `Nat.+` to `frobnicate`, th
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #3fc4t9cl7b
|
||||
⊙ 1. #695699eqes
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.frobnicate Nat.+
|
||||
|
||||
⊙ 2. #s9orh4o9om
|
||||
⊙ 2. #5acatj352b
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.+ Nat.frobnicate
|
||||
|
||||
□ 3. #thnqh4ngaa (start of history)
|
||||
□ 3. #o6oig4fk7p (start of history)
|
||||
|
||||
```
|
||||
If we merge that back into `builtin`, we get that same chain of history:
|
||||
@ -73,21 +73,21 @@ If we merge that back into `builtin`, we get that same chain of history:
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #3fc4t9cl7b
|
||||
⊙ 1. #695699eqes
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.frobnicate Nat.+
|
||||
|
||||
⊙ 2. #s9orh4o9om
|
||||
⊙ 2. #5acatj352b
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.+ Nat.frobnicate
|
||||
|
||||
□ 3. #thnqh4ngaa (start of history)
|
||||
□ 3. #o6oig4fk7p (start of history)
|
||||
|
||||
```
|
||||
Let's try again, but using a `merge.squash` (or just `squash`) instead. The history will be unchanged:
|
||||
@ -108,7 +108,7 @@ Let's try again, but using a `merge.squash` (or just `squash`) instead. The hist
|
||||
|
||||
|
||||
|
||||
□ 1. #thnqh4ngaa (start of history)
|
||||
□ 1. #o6oig4fk7p (start of history)
|
||||
|
||||
```
|
||||
The churn that happened in `mybuiltin` namespace ended up back in the same spot, so the squash merge of that namespace with our original namespace had no effect.
|
||||
@ -493,13 +493,13 @@ This checks to see that squashing correctly preserves deletions:
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #u5k1lfopsu
|
||||
⊙ 1. #erp3nu5u70
|
||||
|
||||
- Deletes:
|
||||
|
||||
Nat.* Nat.+
|
||||
|
||||
□ 2. #thnqh4ngaa (start of history)
|
||||
□ 2. #o6oig4fk7p (start of history)
|
||||
|
||||
```
|
||||
Notice that `Nat.+` and `Nat.*` are deleted by the squash, and we see them deleted in one atomic step in the history.
|
||||
|
@ -57,7 +57,7 @@ proj/main> upgrade old new
|
||||
|
||||
proj/main> ls lib
|
||||
|
||||
1. builtin/ (469 terms, 74 types)
|
||||
1. builtin/ (467 terms, 74 types)
|
||||
2. new/ (1 term)
|
||||
|
||||
proj/main> view thingy
|
||||
|
Loading…
Reference in New Issue
Block a user