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

tweak output message for merge2

Browse Source
This commit is contained in:
Travis Staton 2024-03-19 10:35:05 -04:00
parent 9694d8114d
commit 5cf61d6c51
No known key found for this signature in database
GPG Key ID: 431DD911A00DAE49
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unison-cli/src/Unison/CommandLine/OutputMessages.hs
View File

@ -2254,17 +2254,17 @@ notifyUser dir = \case
MergeFailure path base target ->
pure . P.wrap $
"I couldn't automatically merge"
<> prettyProjectAndBranchName target
<> prettyProjectBranchName (view #branch target)
<> "into"
<> P.group (prettyProjectAndBranchName base <> ".")
<> P.group (prettyProjectBranchName (view #branch base) <> ".")
<> "However, I've added the definitions that need attention to the top of"
<> P.group (prettyFilePath path <> ".")
MergeSuccess base target ->
pure . P.wrap $
"I merged"
<> prettyProjectAndBranchName target
<> prettyProjectBranchName (view #branch target)
<> "into"
<> P.group (prettyProjectAndBranchName base <> ".")
<> P.group (prettyProjectBranchName (view #branch base) <> ".")
where
_nameChange _cmd _pastTenseCmd _oldName _newName _r = error "todo"

14
unison-src/transcripts/merge2.output.md
View File

@ -62,7 +62,7 @@ proj/topic> add
proj/main> merge2 /topic
I merged proj/topic into proj/main.
I merged topic into main.
proj/main> view bar
@ -127,9 +127,9 @@ proj/main> add
proj/main> merge2 /topic
I couldn't automatically merge proj/topic into proj/main.
However, I've added the definitions that need attention to the
top of scratch.u.
I couldn't automatically merge topic into main. However, I've
added the definitions that need attention to the top of
scratch.u.
```
```unison:added-by-ucm scratch.u
@ -240,9 +240,9 @@ attempt to merge `topic` into `main`
```ucm
proj/main> merge2 /topic
I couldn't automatically merge proj/topic into proj/main.
However, I've added the definitions that need attention to the
top of scratch.u.
I couldn't automatically merge topic into main. However, I've
added the definitions that need attention to the top of
scratch.u.
```
```unison:added-by-ucm scratch.u