update wording and transcripts

unisonweb · Jan 8, 2024 · b2737a6 · b2737a6
1 parent d95184d
commit b2737a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs
@@ -2222,19 +2222,13 @@ notifyUser dir = \case
                   <> "again."
             ]
   UpgradeFailure path old new ->
-    pure $
-      P.wrap
-        ( "I couldn't automatically upgrade"
-            <> P.text (NameSegment.toText old)
-            <> "to"
-            <> P.group (P.text (NameSegment.toText new) <> ".")
-        )
-        <> P.newline
-        <> P.newline
-        <> P.wrap
-          ( "I added the problematic definitions to the top of"
-              <> P.group (prettyFilePath path <> ".")
-          )
+    pure . P.wrap $
+      "I couldn't automatically upgrade"
+        <> P.text (NameSegment.toText old)
+        <> "to"
+        <> P.group (P.text (NameSegment.toText new) <> ".")
+        <> "However, I've added the definitions that need attention to the top of"
+        <> P.group (prettyFilePath path <> ".")
   UpgradeSuccess old new ->
     pure . P.wrap $
       "I upgraded"

diff --git a/unison-src/transcripts/fix4482.output.md b/unison-src/transcripts/fix4482.output.md
@@ -57,8 +57,8 @@ myproj/main> upgrade foo0 foo1
     use lib.foo0.lib.bonk1 bar
     ##Nat.+ bar bar
 
-  I couldn't automatically upgrade foo0 to foo1.
-  
-  I added the problematic definitions to the top of scratch.u.
+  I couldn't automatically upgrade foo0 to foo1. However, I've
+  added the definitions that need attention to the top of
+  scratch.u.
 
 ```
diff --git a/unison-src/transcripts/upgrade-sad-path.output.md b/unison-src/transcripts/upgrade-sad-path.output.md
@@ -37,8 +37,8 @@ proj/main> upgrade old new
     use Nat +
     foo + 10
 
-  I couldn't automatically upgrade old to new.
-  
-  I added the problematic definitions to the top of scratch.u.
+  I couldn't automatically upgrade old to new. However, I've
+  added the definitions that need attention to the top of
+  scratch.u.
 
 ```