unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-08-15 13:30:27 +03:00
Code Issues Projects Releases Wiki Activity

Remove loose code demo from branch

Browse Source
This commit is contained in:
Chris Penner 2024-06-25 17:05:50 -07:00
parent bbd02a9129
commit e2f4c388b6
2 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
unison-src/transcripts/branch-command.md
View File

@ -5,21 +5,21 @@ scratch/main> project.create-empty foo
scratch/main> project.create-empty bar
```
First, we'll just create a loose code namespace with a term in it for later.
First, we'll create a term to include in the branches.
```unison:hide
someterm = 18
```
```ucm
scratch/main some.loose.code.lib> builtins.merge
scratch/main some.loose.code> add
scratch/main> builtins.merge lib.builtins
scratch/main> add
```
Now, the `branch` demo:
`branch` can create a branch from a different branch in the same project, from a different branch in a different
project, or from loose code. It can also create an empty branch.
project. It can also create an empty branch.
```ucm
foo/main> branch topic1
@ -40,11 +40,6 @@ bar/main> branch foo/main topic2
bar/main> branch foo/main /topic3
scratch/main> branch foo/main bar/topic4
scratch/main some.loose.code> branch foo/topic13
foo/main> branch .some.loose.code topic14
foo/main> branch .some.loose.code /topic15
scratch/main> branch .some.loose.code foo/topic16
foo/main> branch.empty empty1
foo/main> branch.empty /empty2
foo/main> branch.empty foo/empty3

30
unison-src/transcripts/branch-command.output.md
View File

@ -1,19 +1,17 @@
The `branch` command creates a new branch.
First, we'll just create a loose code namespace with a term in it for later.
First, we'll create a term to include in the branches.
```unison
someterm = 18
```
```ucm
☝️ The namespace .some.loose.code.lib is empty.
.some.loose.code.lib> builtins.merge
scratch/main> builtins.merge lib.builtins
Done.
.some.loose.code> add
scratch/main> add
⍟ I've added these definitions:
@ -23,7 +21,7 @@ someterm = 18
Now, the `branch` demo:
`branch` can create a branch from a different branch in the same project, from a different branch in a different
project, or from loose code. It can also create an empty branch.
project. It can also create an empty branch.
```ucm
foo/main> branch topic1
@ -126,26 +124,6 @@ scratch/main> branch foo/main bar/topic4
Done. I've created the bar/topic4 branch based off foo/main.
.some.loose.code> branch foo/topic13
Done. I've created the foo/topic13 branch from the namespace
.some.loose.code.
foo/main> branch .some.loose.code topic14
Done. I've created the foo/topic14 branch from the namespace
.some.loose.code.
foo/main> branch .some.loose.code /topic15
Done. I've created the foo/topic15 branch from the namespace
.some.loose.code.
scratch/main> branch .some.loose.code foo/topic16
Done. I've created the foo/topic16 branch from the namespace
.some.loose.code.
foo/main> branch.empty empty1
Done. I've created an empty branch foo/empty1.