diff options
Diffstat (limited to 'lib/management')
| -rw-r--r-- | lib/management/branch.ml | 6 | ||||
| -rw-r--r-- | lib/management/merge.ml | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/management/branch.ml b/lib/management/branch.ml index 4485b35..81da225 100644 --- a/lib/management/branch.ml +++ b/lib/management/branch.ml @@ -102,8 +102,7 @@ module Make (Storage : Physical.S with type error = string) = struct ~generator:(Some generator) ~membership_criteria:(fun _ _ -> true) ~provenance:(Relation.Provenance.Base Prelude.Catalog.branch_rel_name) - ~lineage:(Relation.Lineage.Base Prelude.Catalog.branch_rel_name) - () + ~lineage:(Relation.Lineage.Base Prelude.Catalog.branch_rel_name) () let head_relation storage : Relation.t = let schema = Schema.empty |> Schema.add "branch" "string" in @@ -130,6 +129,5 @@ module Make (Storage : Physical.S with type error = string) = struct ~generator:(Some generator) ~membership_criteria:(fun _ _ -> true) ~provenance:(Relation.Provenance.Base Prelude.Catalog.head_rel_name) - ~lineage:(Relation.Lineage.Base Prelude.Catalog.head_rel_name) - () + ~lineage:(Relation.Lineage.Base Prelude.Catalog.head_rel_name) () end diff --git a/lib/management/merge.ml b/lib/management/merge.ml index a8860fe..dff4808 100644 --- a/lib/management/merge.ml +++ b/lib/management/merge.ml @@ -11,6 +11,7 @@ type strategy = PreferLeft | PreferRight | RevertToAncestor type merge_result = Clean of Database.t | Failed of conflict list (* TODO: Remove this later. We already should have the interface on the manipulation *) + (** Module type for the subset of Manipulation.Make we need. *) module type MANIPULATION = sig type storage @@ -279,9 +280,9 @@ struct all_conflicts in if unresolvable <> [] then Ok (Failed unresolvable) - else begin - match Manip.store_database storage merged_db with + else + begin match Manip.store_database storage merged_db with | Error e -> Error e | Ok () -> Ok (Clean merged_db) - end))) + end))) end |