mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-19 06:17:33 +03:00
Transcript fixes
This commit is contained in:
parent
8ba6e8445f
commit
bbb2e52e6a
@ -157,15 +157,15 @@ Let's try it!
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
125. ImmutableByteArray.read16 : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
126. ImmutableByteArray.read32 : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
127. ImmutableByteArray.read64 : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
125. ImmutableByteArray.read16be : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
126. ImmutableByteArray.read32be : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
127. ImmutableByteArray.read64be : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
128. ImmutableByteArray.read8 : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
@ -470,30 +470,30 @@ Let's try it!
|
||||
->{g} ImmutableByteArray
|
||||
331. MutableByteArray.freeze! : MutableByteArray g
|
||||
->{g} ImmutableByteArray
|
||||
332. MutableByteArray.read16 : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
333. MutableByteArray.read32 : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
334. MutableByteArray.read64 : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
332. MutableByteArray.read16be : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
333. MutableByteArray.read32be : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
334. MutableByteArray.read64be : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
335. MutableByteArray.read8 : MutableByteArray g
|
||||
-> Nat
|
||||
->{g, Exception} Nat
|
||||
336. MutableByteArray.write16 : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
337. MutableByteArray.write32 : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
338. MutableByteArray.write64 : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
336. MutableByteArray.write16be : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
337. MutableByteArray.write32be : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
338. MutableByteArray.write64be : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g, Exception} ()
|
||||
339. MutableByteArray.write8 : MutableByteArray g
|
||||
-> Nat
|
||||
-> Nat
|
||||
|
@ -121,13 +121,13 @@ We can also delete the fork if we're done with it. (Don't worry, it's still in t
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #abf3t3skdj
|
||||
⊙ 1. #mcqqte53bn
|
||||
|
||||
- Deletes:
|
||||
|
||||
feature1.y
|
||||
|
||||
⊙ 2. #7u7981fggg
|
||||
⊙ 2. #ujgae8vdq6
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
@ -138,26 +138,26 @@ We can also delete the fork if we're done with it. (Don't worry, it's still in t
|
||||
Original name New name(s)
|
||||
feature1.y master.y
|
||||
|
||||
⊙ 3. #n3thhc4ija
|
||||
⊙ 3. #p4h54aa4ib
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
feature1.y
|
||||
|
||||
⊙ 4. #emlkep058v
|
||||
⊙ 4. #5duofffdoh
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
x master.x
|
||||
|
||||
⊙ 5. #eh2rm2mt08
|
||||
⊙ 5. #s3idlrliqf
|
||||
|
||||
+ Adds / updates:
|
||||
|
||||
x
|
||||
|
||||
□ 6. #84g32tb0ov (start of history)
|
||||
□ 6. #9dqsngn7um (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`.
|
||||
|
@ -990,26 +990,26 @@ d = c + 10
|
||||
->{g} a
|
||||
345. builtin.io2.TVar.read : TVar a
|
||||
->{STM} a
|
||||
346. builtin.ImmutableByteArray.read16 : ImmutableByteArray
|
||||
346. builtin.ImmutableByteArray.read16be : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
347. builtin.MutableByteArray.read16 : MutableByteArray
|
||||
347. builtin.MutableByteArray.read16be : MutableByteArray
|
||||
g
|
||||
-> Nat
|
||||
->{g,
|
||||
Exception} Nat
|
||||
348. builtin.ImmutableByteArray.read32 : ImmutableByteArray
|
||||
348. builtin.ImmutableByteArray.read32be : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
349. builtin.MutableByteArray.read32 : MutableByteArray
|
||||
349. builtin.MutableByteArray.read32be : MutableByteArray
|
||||
g
|
||||
-> Nat
|
||||
->{g,
|
||||
Exception} Nat
|
||||
350. builtin.ImmutableByteArray.read64 : ImmutableByteArray
|
||||
350. builtin.ImmutableByteArray.read64be : ImmutableByteArray
|
||||
-> Nat
|
||||
->{Exception} Nat
|
||||
351. builtin.MutableByteArray.read64 : MutableByteArray
|
||||
351. builtin.MutableByteArray.read64be : MutableByteArray
|
||||
g
|
||||
-> Nat
|
||||
->{g,
|
||||
@ -1212,19 +1212,19 @@ d = c + 10
|
||||
429. builtin.io2.TVar.write : TVar a
|
||||
-> a
|
||||
->{STM} ()
|
||||
430. builtin.MutableByteArray.write16 : MutableByteArray
|
||||
430. builtin.MutableByteArray.write16be : MutableByteArray
|
||||
g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g,
|
||||
Exception} ()
|
||||
431. builtin.MutableByteArray.write32 : MutableByteArray
|
||||
431. builtin.MutableByteArray.write32be : MutableByteArray
|
||||
g
|
||||
-> Nat
|
||||
-> Nat
|
||||
->{g,
|
||||
Exception} ()
|
||||
432. builtin.MutableByteArray.write64 : MutableByteArray
|
||||
432. builtin.MutableByteArray.write64be : MutableByteArray
|
||||
g
|
||||
-> Nat
|
||||
-> Nat
|
||||
|
@ -59,16 +59,16 @@ y = 2
|
||||
most recent, along with the command that got us there. Try:
|
||||
|
||||
`fork 2 .old`
|
||||
`fork #rca6hfi0r8 .old` to make an old namespace
|
||||
`fork #kf3i16i9lh .old` to make an old namespace
|
||||
accessible again,
|
||||
|
||||
`reset-root #rca6hfi0r8` to reset the root namespace and
|
||||
`reset-root #kf3i16i9lh` to reset the root namespace and
|
||||
its history to that of the
|
||||
specified namespace.
|
||||
|
||||
1. #lr7nj9g3hf : add
|
||||
2. #rca6hfi0r8 : add
|
||||
3. #eioje18gql : builtins.merge
|
||||
1. #u4dg7hpdsv : add
|
||||
2. #kf3i16i9lh : add
|
||||
3. #3omft8cib5 : builtins.merge
|
||||
4. #sg60bvjo91 : (initial reflogged namespace)
|
||||
|
||||
```
|
||||
|
@ -13,7 +13,7 @@ Let's look at some examples. We'll start with a namespace with just the builtins
|
||||
|
||||
|
||||
|
||||
□ 1. #6df7la2hva (start of history)
|
||||
□ 1. #pkghak0jll (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. #0krh277ege
|
||||
⊙ 1. #4kv78foqvp
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.frobnicate Nat.+
|
||||
|
||||
⊙ 2. #togjet5r88
|
||||
⊙ 2. #idn2q6rkrk
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.+ Nat.frobnicate
|
||||
|
||||
□ 3. #6df7la2hva (start of history)
|
||||
□ 3. #pkghak0jll (start of history)
|
||||
|
||||
```
|
||||
If we merge that back into `builtin`, we get that same chain of history:
|
||||
@ -71,21 +71,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. #0krh277ege
|
||||
⊙ 1. #4kv78foqvp
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.frobnicate Nat.+
|
||||
|
||||
⊙ 2. #togjet5r88
|
||||
⊙ 2. #idn2q6rkrk
|
||||
|
||||
> Moves:
|
||||
|
||||
Original name New name
|
||||
Nat.+ Nat.frobnicate
|
||||
|
||||
□ 3. #6df7la2hva (start of history)
|
||||
□ 3. #pkghak0jll (start of history)
|
||||
|
||||
```
|
||||
Let's try again, but using a `merge.squash` (or just `squash`) instead. The history will be unchanged:
|
||||
@ -106,7 +106,7 @@ Let's try again, but using a `merge.squash` (or just `squash`) instead. The hist
|
||||
|
||||
|
||||
|
||||
□ 1. #6df7la2hva (start of history)
|
||||
□ 1. #pkghak0jll (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.
|
||||
@ -485,13 +485,13 @@ This checks to see that squashing correctly preserves deletions:
|
||||
Note: The most recent namespace hash is immediately below this
|
||||
message.
|
||||
|
||||
⊙ 1. #h7cl4aka6v
|
||||
⊙ 1. #2sduecu6ns
|
||||
|
||||
- Deletes:
|
||||
|
||||
Nat.* Nat.+
|
||||
|
||||
□ 2. #6df7la2hva (start of history)
|
||||
□ 2. #pkghak0jll (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.
|
||||
|
Loading…
Reference in New Issue
Block a user