mirror of
https://github.com/unisonweb/unison.git
synced 2024-09-11 02:25:39 +03:00
minor cleanup
This commit is contained in:
parent
9afdce5e3a
commit
d7b48dcb5c
@ -116,12 +116,6 @@ file = do
|
||||
watches <- case List.validate (traverseOf (traversed . _3) bindNames) watches of
|
||||
Left es -> resolutionFailures (toList es)
|
||||
Right ws -> pure ws
|
||||
-- let uf =
|
||||
-- UnisonFileId
|
||||
-- (UF.datasId env)
|
||||
-- (UF.effectsId env)
|
||||
-- (List.foldl' (\acc (a, b, c) -> Map.insert a (b, c) acc) Map.empty (terms <> join accessors))
|
||||
-- (List.multimap watches)
|
||||
validateUnisonFile
|
||||
(UF.datasId env)
|
||||
(UF.effectsId env)
|
||||
|
@ -1197,8 +1197,6 @@ inputDescription input =
|
||||
src <- either (pure . Text.pack . show) brp src0
|
||||
dest <- brp dest0
|
||||
pure ("fork " <> src <> " " <> dest)
|
||||
MergeI _tgt -> do
|
||||
pure "todo"
|
||||
MergeLocalBranchI src0 dest0 mode -> do
|
||||
src <- looseCodeOrProjectToText src0
|
||||
dest <- looseCodeOrProjectToText dest0
|
||||
@ -1378,6 +1376,7 @@ inputDescription input =
|
||||
ListDependentsI {} -> wat
|
||||
ListEditsI {} -> wat
|
||||
LoadI {} -> wat
|
||||
MergeI {} -> wat
|
||||
NamesI {} -> wat
|
||||
NamespaceDependenciesI {} -> wat
|
||||
PopBranchI {} -> wat
|
||||
|
@ -1,6 +0,0 @@
|
||||
|
||||
module Unison.Merge
|
||||
(
|
||||
)
|
||||
where
|
||||
|
@ -26,7 +26,7 @@ make = \case
|
||||
This alice -> one Alice alice
|
||||
That bob -> one Bob bob
|
||||
These (DiffOp'Add alice) (DiffOp'Add bob) -> TwoDiffOps'AddAdd TwoWay {alice, bob}
|
||||
These (DiffOp'Delete alice) (DiffOp'Delete _bob) -> TwoDiffOps'DeleteDelete alice
|
||||
These (DiffOp'Delete alice) (DiffOp'Delete _) -> TwoDiffOps'DeleteDelete alice
|
||||
These (DiffOp'Delete _) (DiffOp'Update bob) -> TwoDiffOps'DeleteUpdate bob
|
||||
These (DiffOp'Update alice) (DiffOp'Delete _) -> TwoDiffOps'UpdateDelete alice
|
||||
These (DiffOp'Update alice) (DiffOp'Update bob) ->
|
||||
|
@ -17,7 +17,6 @@ source-repository head
|
||||
|
||||
library
|
||||
exposed-modules:
|
||||
Unison.Merge
|
||||
Unison.Merge.CombineDiffs
|
||||
Unison.Merge.Database
|
||||
Unison.Merge.DeclCoherencyCheck
|
||||
|
@ -77,7 +77,7 @@ project/bob> add
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo bar
|
||||
|
||||
@ -166,7 +166,7 @@ project/bob> add
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo bar
|
||||
|
||||
@ -278,7 +278,7 @@ project/bob> add
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo bar
|
||||
|
||||
@ -415,7 +415,7 @@ project/bob> update
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo bar baz
|
||||
|
||||
@ -553,7 +553,7 @@ project/bob> update
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo bar baz
|
||||
|
||||
@ -648,7 +648,7 @@ project/bob> delete.term foo
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo
|
||||
|
||||
@ -750,7 +750,7 @@ project/bob> add
|
||||
|
||||
project/alice> merge bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
project/alice> view foo bar baz
|
||||
|
||||
@ -895,7 +895,7 @@ project/bob> add
|
||||
|
||||
project/alice> merge /bob
|
||||
|
||||
I merged bob into alice.
|
||||
I merged /bob into /alice.
|
||||
|
||||
```
|
||||
## Merge failure: someone deleted something
|
||||
|
Loading…
Reference in New Issue
Block a user