diff options
Diffstat (limited to '')
| -rw-r--r-- | lib/management/branch.ml | 4 | ||||
| -rw-r--r-- | lib/management/merge.ml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/management/branch.ml b/lib/management/branch.ml index ea15311..1d218b1 100644 --- a/lib/management/branch.ml +++ b/lib/management/branch.ml @@ -100,7 +100,7 @@ module Make (Storage : Physical.S with type error = string) = struct ~tree:None ~constraints:None ~cardinality:Conventions.Cardinality.ConstrainedFinite ~generator:(Some generator) - ~membership_criteria:(fun _ -> true) + ~membership_criteria:(fun _ _ -> true) ~provenance:(Relation.Provenance.Base Prelude.Catalog.branch_rel_name) ~lineage:(Relation.Lineage.Base Prelude.Catalog.branch_rel_name) @@ -127,7 +127,7 @@ module Make (Storage : Physical.S with type error = string) = struct ~tree:None ~constraints:None ~cardinality:Conventions.Cardinality.ConstrainedFinite ~generator:(Some generator) - ~membership_criteria:(fun _ -> true) + ~membership_criteria:(fun _ _ -> true) ~provenance:(Relation.Provenance.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 d30545a..a8860fe 100644 --- a/lib/management/merge.ml +++ b/lib/management/merge.ml @@ -10,6 +10,7 @@ type conflict = 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 |