From 6f19a87497027cbd5c40f9541d00e7ced308781d Mon Sep 17 00:00:00 2001 From: Chris Penner Date: Mon, 1 Jul 2024 23:35:58 -0700 Subject: [PATCH] Update merge.md and fix5129 --- unison-src/transcripts-using-base/fix5129.md | 2 +- unison-src/transcripts/merge.md | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/unison-src/transcripts-using-base/fix5129.md b/unison-src/transcripts-using-base/fix5129.md index ccdd8bee4..a1e8ad345 100644 --- a/unison-src/transcripts-using-base/fix5129.md +++ b/unison-src/transcripts-using-base/fix5129.md @@ -1,5 +1,5 @@ ```ucm:hide -.> builtins.mergeio +scratch/main> builtins.mergeio lib.builtins ``` Checks for some bad type checking behavior. Some ability subtyping was diff --git a/unison-src/transcripts/merge.md b/unison-src/transcripts/merge.md index 6dfb48d04..3948471c2 100644 --- a/unison-src/transcripts/merge.md +++ b/unison-src/transcripts/merge.md @@ -464,7 +464,7 @@ project/main> merge /topic ``` ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` ## Merge failure: someone deleted something @@ -962,7 +962,7 @@ project/alice> merge bob ``` ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` ## `merge.commit` example (success) @@ -971,7 +971,6 @@ After merge conflicts are resolved, you can use `merge.commit` rather than `swit "commit" your changes. ```ucm:hide -.> project.create-empty project project/main> builtins.mergeio lib.builtins ``` @@ -1028,7 +1027,7 @@ project/alice> branches ``` ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` ## `merge.commit` example (failure) @@ -1036,7 +1035,6 @@ project/alice> branches `merge.commit` can only be run on a "merge branch". ```ucm:hide -.> project.create-empty project project/main> builtins.mergeio lib.builtins ``` @@ -1049,7 +1047,7 @@ project/topic> merge.commit ``` ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` @@ -1527,7 +1525,7 @@ project/main> view Foo ``` ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` ### Dependent that doesn't need to be in the file @@ -1592,7 +1590,7 @@ project/alice> merge /bob But `bar` was put into the scratch file instead. ```ucm:hide -.> project.delete project +scratch/main> project.delete project ``` ### Merge loop test