mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-17 13:27:30 +03:00
0031542faf
This is for consistency with the `cmark` style. Now the blocks we still pretty-print ourselves will match the bulk of them that `cmark` produces.
4.4 KiB
4.4 KiB
reset loose code
a = 5
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These new definitions are ok to `add`:
a : Nat
scratch/main> add
⍟ I've added these definitions:
a : Nat
scratch/main> history
Note: The most recent namespace hash is immediately below this
message.
⊙ 1. #d079vet1oj
+ Adds / updates:
a
□ 2. #4bigcpnl7t (start of history)
scratch/main> reset 2
Done.
scratch/main> history
Note: The most recent namespace hash is immediately below this
message.
□ 1. #4bigcpnl7t (start of history)
foo.a = 5
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These new definitions are ok to `add`:
foo.a : Nat
scratch/main> add
⍟ I've added these definitions:
foo.a : Nat
scratch/main> ls foo
1. a (Nat)
scratch/main> history
Note: The most recent namespace hash is immediately below this
message.
⊙ 1. #tfg7r9359n
+ Adds / updates:
foo.a
□ 2. #4bigcpnl7t (start of history)
scratch/main> reset 1 foo
Done.
scratch/main> ls foo.foo
1. a (Nat)
reset branch
foo/main> history
☝️ The namespace is empty.
a = 5
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These new definitions are ok to `add`:
a : ##Nat
foo/main> add
⍟ I've added these definitions:
a : ##Nat
foo/main> branch topic
Done. I've created the topic branch based off of main.
Tip: To merge your work back into the main branch, first
`switch /main` then `merge /topic`.
foo/main> history
Note: The most recent namespace hash is immediately below this
message.
□ 1. #5l94rduvel (start of history)
a = 3
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These names already exist. You can `update` them to your
new definition:
a : ##Nat
foo/main> update
Okay, I'm searching the branch for code that needs to be
updated...
Done.
foo/main> reset /topic
Done.
foo/main> history
Note: The most recent namespace hash is immediately below this
message.
□ 1. #5l94rduvel (start of history)
ambiguous reset
ambiguous target
main.a = 3
Loading changes detected in scratch.u.
I found and typechecked these definitions in scratch.u. If you
do an `add` or `update`, here's how your codebase would
change:
⍟ These new definitions are ok to `add`:
main.a : ##Nat
foo/main> add
⍟ I've added these definitions:
main.a : ##Nat
foo/main> history
Note: The most recent namespace hash is immediately below this
message.
⊙ 1. #0i64kpfccl
+ Adds / updates:
main.a
□ 2. #5l94rduvel (start of history)
foo/main> reset 2 main
I'm not sure if you wanted to reset the branch foo/main or the
namespace main in the current branch. Could you be more
specific?
1. /main (the branch main in the current project)
2. main (the relative path main in the current branch)
Tip: use `reset <some hash> 1` or `reset <some hash> 2` to
pick one of these.
ambiguous hash
main.a = 3
Loading changes detected in scratch.u.
I found and typechecked the definitions in scratch.u. This
file has been previously added to the codebase.
foo/main> switch /topic
foo/topic> add
⍟ I've added these definitions:
main.a : ##Nat
foo/topic> reset main
I'm not sure if you wanted to reset to the branch foo/main or
to the namespace main in the current branch. Could you be more
specific?
1. /main (the branch main in the current project)
2. main (the relative path main in the current branch)
Tip: use `reset 1` or `reset 2` to pick one of these.