Skip to content

Commit 9752bbc

Browse files
committed
un-rename reset-root
1 parent 8fad9a3 commit 9752bbc

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ main = do
3434
I found and typechecked these definitions in scratch.u. If you
3535
do an `add` or `update`, here's how your codebase would
3636
change:
37-
37+
3838
⍟ These new definitions are ok to `add`:
39-
39+
4040
structural ability Break
4141
type MyBool
4242
main : '{IO, Exception} ()
@@ -47,7 +47,7 @@ main = do
4747
.> add
4848
4949
⍟ I've added these definitions:
50-
50+
5151
structural ability Break
5252
type MyBool
5353
main : '{IO, Exception} ()

unison-cli/src/Unison/CommandLine/InputPatterns.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ reset =
12671267
resetRoot :: InputPattern
12681268
resetRoot =
12691269
InputPattern
1270-
"deprecated.reset-root"
1270+
"reset-root"
12711271
[]
12721272
I.Hidden
12731273
[("namespace or hash to reset to", Required, namespaceArg)]

unison-cli/tests/Unison/Test/GitSync.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ test =
286286
```ucm
287287
.> pull git(${repo})
288288
.> history
289-
.> deprecated.reset-root #l43v9nr16v
289+
.> reset-root #l43v9nr16v
290290
.> history
291291
```
292292
|] -- Not sure why this hash is here.

unison-src/transcripts/reflog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ y = 2
2424

2525
If we `reset-root` to its previous value, `y` disappears.
2626
```ucm
27-
.> deprecated.reset-root 2
27+
.> reset-root 2
2828
```
2929
```ucm:error
3030
.> view y

unison-src/transcripts/reflog.output.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,13 @@ y = 2
6262
Here is a log of the root namespace hashes, starting with the
6363
most recent, along with the command that got us there. Try:
6464
65-
`fork 2 .old`
66-
`fork #mq4oqhiuuq .old` to make an old
67-
namespace accessible
68-
again,
69-
70-
`deprecated.reset-root #mq4oqhiuuq` to reset the root
71-
namespace and its
72-
history to that of the
73-
specified namespace.
65+
`fork 2 .old`
66+
`fork #mq4oqhiuuq .old` to make an old namespace
67+
accessible again,
68+
69+
`reset-root #mq4oqhiuuq` to reset the root namespace and
70+
its history to that of the
71+
specified namespace.
7472
7573
When Root Hash Action
7674
1. now #1n5tjujeu7 add
@@ -84,7 +82,7 @@ y = 2
8482
```
8583
If we `reset-root` to its previous value, `y` disappears.
8684
```ucm
87-
.> deprecated.reset-root 2
85+
.> reset-root 2
8886
8987
Done.
9088

0 commit comments

Comments
 (0)