Skip to content

make $MERGED absolute #5882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2025
+12 −2
Merged

make $MERGED absolute #5882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions unison-cli/src/Unison/Codebase/Editor/HandleInput/Merge2.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ import Data.Semialign (zipWith)
import Data.Set qualified as Set
import Data.Text qualified as Text
import Data.Text.IO qualified as Text
import System.Directory (canonicalizePath, getTemporaryDirectory, removeFile)
import System.Directory (canonicalizePath, getCurrentDirectory, getTemporaryDirectory, removeFile)
import System.Environment (lookupEnv)
import System.FilePath ((</>))
import System.IO.Temp qualified as Temporary
import System.OsPath qualified
import System.Process qualified as Process
import Text.ANSI qualified as Text
import Text.Builder qualified
Expand Down Expand Up @@ -418,7 +419,16 @@ doMerge info = do
alice = aliceFilenameSlug <> ".u",
bob = bobFilenameSlug <> ".u"
}
let mergedFilename = Text.Builder.run (aliceFilenameSlug <> "-" <> bobFilenameSlug <> "-merged.u")
mergedFilename <- do
cwd <- liftIO getCurrentDirectory
pure $
Text.Builder.run $
Text.Builder.string cwd
<> Text.Builder.char (System.OsPath.toChar System.OsPath.pathSeparator)
<> aliceFilenameSlug
<> "-"
<> bobFilenameSlug
<> "-merged.u"
let mergetool =
mergetool0
& Text.pack
Expand Down