don't update in upgrade

unison-cli/src/Unison/Codebase/Editor/HandleInput/CommitUpgrade.hs

@@ -12,7 +12,6 @@ import Unison.Cli.ProjectUtils qualified as ProjectUtils
 import Unison.Codebase.Editor.HandleInput.DeleteBranch qualified as DeleteBranch
 import Unison.Codebase.Editor.HandleInput.Merge2 qualified as Merge
 import Unison.Codebase.Editor.HandleInput.ProjectSwitch qualified as ProjectSwitch
-import Unison.Codebase.Editor.HandleInput.Update2 qualified as Update
 import Unison.Codebase.Editor.Output qualified as Output
 import Unison.Merge.TwoWay (TwoWay (..))
 import Unison.Prelude
@@ -34,10 +33,6 @@ handleCommitUpgrade = do
   let parentProjectAndBranch =
         ProjectAndBranch upgradeProjectAndBranch.project parentBranch
 
-  -- Run `update`
-
-  Update.handleUpdate2
-
   -- Switch to the parent
 
   ProjectSwitch.switchToProjectBranch (ProjectUtils.justTheIds parentProjectAndBranch)

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

@@ -1188,8 +1188,6 @@ notifyUser dir = \case
   LoadingFile sourceName -> do
     fileName <- renderFileName $ Text.unpack sourceName
     pure $ P.wrap $ "Loading changes detected in " <> P.group (fileName <> ".")
-  -- TODO: Present conflicting TermEdits and TypeEdits
-  -- if we ever allow users to edit hashes directly.
   Typechecked sourceName ppe slurpResult uf -> do
     let fileStatusMsg = SlurpResult.pretty False ppe slurpResult
     let containsWatchExpressions = notNull $ UF.watchComponents uf
@@ -1222,8 +1220,7 @@ notifyUser dir = \case
                                 <> IP.makeExample' IP.add
                                 <> " or "
                                 <> P.group (IP.makeExample' IP.update <> ",")
-                                <> "here's how your codebase would"
-                                <> "change:",
+                                <> "here's how your codebase would change:",
                             P.indentN 2 $ SlurpResult.pretty False ppe slurpResult
                           ]
               ]

unison-src/transcripts/upgrade-sad-path.md

@@ -24,6 +24,7 @@ thingy = foo + +10
 ```
 
 ```ucm
+proj/upgrade-old-to-new> update
 proj/upgrade-old-to-new> upgrade.commit
 proj/main> view thingy
 proj/main> ls lib

unison-src/transcripts/upgrade-sad-path.output.md

@@ -65,13 +65,15 @@ thingy = foo + +10
 
 ```
 ```ucm
-proj/upgrade-old-to-new> upgrade.commit
+proj/upgrade-old-to-new> update
 
   Okay, I'm searching the branch for code that needs to be
   updated...
 
   Done.
 
+proj/upgrade-old-to-new> upgrade.commit
+
   I fast-forward merged proj/upgrade-old-to-new into proj/main.
 
 proj/main> view thingy