unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 10:35:57 +03:00
Code Issues Projects Releases Wiki Activity

remove fix2000.md

Browse Source
This commit is contained in:
Mitchell Rosen 2024-06-26 11:26:37 -04:00
parent 95fc3aabfd
commit 267bfdf248
2 changed files with 0 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
unison-src/transcripts/fix2000.md
View File

@ -1,44 +0,0 @@
Checks that squash and merge do the same thing, with nontrivial history that
includes a merge conflict.
```ucm:hide
.> builtins.merge
```
```unison
x.a.p = "af"
x.a.q = "ef"
```
```ucm
.> add
.> fork x y
.> fork x s
.> fork x m
.> delete.verbose y.a.p
```
```unison
y.a.p = "fij"
```
```ucm
.> add
```
```unison
y.b.p = "wie"
```
Merge back into the ancestor.
```ucm
.> add
.> merge.old y.b y.a
.> delete.term.verbose 1
.> merge.old y m
.> merge.old.squash y s
.s> todo
.m> todo
```

188
unison-src/transcripts/fix2000.output.md
View File

@ -1,188 +0,0 @@
Checks that squash and merge do the same thing, with nontrivial history that
includes a merge conflict.
```unison
x.a.p = "af"
x.a.q = "ef"
```
```ucm
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`:
x.a.p : Text
x.a.q : Text
```
```ucm
.> add
⍟ I've added these definitions:
x.a.p : Text
x.a.q : Text
.> fork x y
Done.
.> fork x s
Done.
.> fork x m
Done.
.> delete.verbose y.a.p
Name changes:
Original Changes
1. m.a.p ┐ 2. y.a.p (removed)
3. s.a.p │
4. x.a.p │
5. y.a.p ┘
Tip: You can use `undo` or `reflog` to undo this change.
```
```unison
y.a.p = "fij"
```
```ucm
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`:
y.a.p : Text
```
```ucm
.> add
⍟ I've added these definitions:
y.a.p : Text
```
```unison
y.b.p = "wie"
```
```ucm
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`:
y.b.p : Text
```
Merge back into the ancestor.
```ucm
.> add
⍟ I've added these definitions:
y.b.p : Text
.> merge.old y.b y.a
Here's what's changed in y.a after the merge:
New name conflicts:
1. p#l2mmpgn323 : Text
↓
2. ┌ p#l2mmpgn323 : Text
3. └ p#nm3omrdks9 : Text
Tip: You can use `todo` to see if this generated any work to
do in this namespace and `test` to run the tests. Or you
can use `undo` or `reflog` to undo the results of this
merge.
Applying changes from patch...
.> delete.term.verbose 1
Resolved name conflicts:
1. ┌ y.a.p#l2mmpgn323 : Text
2. └ y.a.p#nm3omrdks9 : Text
↓
3. y.a.p#nm3omrdks9 : Text
Tip: You can use `undo` or `reflog` to undo this change.
.> merge.old y m
Here's what's changed in m after the merge:
Updates:
1. a.p : Text
↓
2. a.p : Text
Added definitions:
3. ┌ a.p : Text
4. └ b.p : Text
Tip: You can use `todo` to see if this generated any work to
do in this namespace and `test` to run the tests. Or you
can use `undo` or `reflog` to undo the results of this
merge.
Applying changes from patch...
.> merge.old.squash y s
Here's what's changed in s after the merge:
Updates:
1. a.p : Text
↓
2. a.p : Text
Added definitions:
3. ┌ a.p : Text
4. └ b.p : Text
Tip: You can use `todo` to see if this generated any work to
do in this namespace and `test` to run the tests. Or you
can use `undo` or `reflog` to undo the results of this
merge.
Applying changes from patch...
.s> todo
.m> todo
```