unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-23 08:18:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1623 from unisonweb/topic/bug1574

Browse Source 
Show names from merged namespace after merge
This commit is contained in:
mergify[bot] 2020-06-19 23:02:38 +00:00 committed by GitHub
commit 628c30058a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
View File

@ -2166,10 +2166,11 @@ mergeBranchAndPropagateDefaultPatch mode inputDescription unchangedMessage srcb
mergeBranch mode inputDescription srcb dest0 dest = unsafeTime "Merge Branch" $ do
destb <- getAt dest
merged <- eval . Eval $ Branch.merge' mode srcb destb
b <- updateAtM inputDescription dest (const $ pure merged)
for_ dest0 $ \dest0 ->
diffHelper (Branch.head destb) (Branch.head merged) >>=
respondNumbered . uncurry (ShowDiffAfterMerge dest0 dest)
updateAtM inputDescription dest (const $ pure merged)
pure b
loadPropagateDiffDefaultPatch :: (Monad m, Var v) =>
InputDescription -> Maybe Path.Path' -> Path.Absolute -> Action' m v ()

6
unison-src/transcripts/delete.output.md
View File

@ -183,10 +183,10 @@ type Foo = Foo Boolean
3. └ type Foo#gq9inhvg9h
4. Foo.Foo#d97e0jhkmd#0 : Nat -> Foo
4. Foo.Foo#d97e0jhkmd#0 : Nat -> Foo#d97e0jhkmd
↓
5. ┌ Foo.Foo#d97e0jhkmd#0 : Nat -> Foo
6. └ Foo.Foo#gq9inhvg9h#0 : Boolean -> b.Foo
5. ┌ Foo.Foo#d97e0jhkmd#0 : Nat -> Foo#d97e0jhkmd
6. └ Foo.Foo#gq9inhvg9h#0 : Boolean -> Foo#gq9inhvg9h
Tip: You can use `todo` to see if this generated any work to
do in this namespace and `test` to run the tests. Or you