Skip to content

Commit f2a0af4

Browse files
committed
Rerun transcripts
1 parent dd3a9a2 commit f2a0af4

File tree

3 files changed

+18
-41
lines changed

3 files changed

+18
-41
lines changed

transcripts/share-apis/history-comments/run.zsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
source "../../transcript_helpers.sh"
66

77
# Currently this must be manually enabled
8-
# export UNISON_SYNC_HISTORY_COMMENTS=true
8+
export UNISON_SYNC_HISTORY_COMMENTS=true
99

1010
# Create some history
1111
transcript_ucm transcript comment-push.md
Lines changed: 15 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,26 @@
1-
``` ucm :hide
2-
scratch/main> project.create-empty ambiguous
1+
🐞
32

4-
ambiguous/main> builtins.merge
5-
```
3+
🐞
64

7-
Create a flawed component which should be rejected with an ambiguous element ordering error.
5+
Sorry, you've encountered a weird situation that we are aware of and are currently working on a fix for.
6+
I'll explain what happened and how you can work around it.
87

9-
``` unison
10-
ping = do
11-
pong()
8+
The following cyclic definition sets could not be completely ordered:
9+
* User "ping", User "pong"
1210

13-
pong = do
14-
ping()
15-
```
1611

17-
``` ucm :added-by-ucm
18-
Loading changes detected in scratch.u.
12+
This happens when multiple definitions in a mutually recursive cycle have a very similar structure.
1913

20-
+ ping : 'r
21-
+ pong : 'r
14+
You can work around this by restructuring them to be less similar, e.g. by adding a pure expression to distinguish them, like:
15+
_ = "this is the foo definition"
2216

23-
Run `update` to apply these changes to your codebase.
24-
```
2517

26-
``` ucm :hide
27-
ambiguous/main> update
28-
```
18+
This is a Unison bug and you can report it here:
2919

30-
Try to push, this should be rejected.
20+
https://github.com/unisonweb/unison/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+E253299+
3121

32-
``` ucm
33-
ambiguous/main> push @transcripts/ambiguous/main
34-
```
22+
Bug reference: E253299
3523

36-
🛑
37-
38-
The transcript failed due to an error in the stanza above. The error is:
39-
40-
```
41-
❗️
42-
43-
Failed to decode a term component entity with the hash
44-
#6nhsou2jbd9o95ftlp83v1dhqo7cmk0jb4tgkecmurku9en8qqnr205arlacgj3tumu6sfudhi100lqcvu2sbf4t412nngvbeuboeig
45-
.
46-
Please create an issue and report this to the Unison team
47-
48-
The error was: Incomplete element ordering in term components
49-
```
24+
If there's already an issue with this reference, you can give a 👍
25+
on the issue to let the team know you encountered it, and you can add
26+
any additional details you know of to the issue.

transcripts/share-apis/sync/sync.output.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Push and pull it back.
4545
``` ucm
4646
proj/main> push @transcripts/proj/main
4747
48-
Uploaded 466 entities.
48+
Uploaded 469 entities.
4949
5050
I just created @transcripts/proj on http://localhost:5424
5151
@@ -71,7 +71,7 @@ proj/pulled> ls .
7171
4. B. (2 terms)
7272
5. a ('Nat)
7373
6. b ('Nat)
74-
7. builtin. (676 terms, 107 types)
74+
7. builtin. (684 terms, 108 types)
7575
8. xs (['Nat])
7676
9. ys ([Nat])
7777
```

0 commit comments

Comments
 (0)