Fix pull, so that edges are added to version graph

cuplv · Nov 2, 2021 · e55db24 · e55db24
1 parent 2c7afc3
commit e55db24
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/mergedb.nix b/mergedb.nix
@@ -11,5 +11,10 @@ buildDunePackage rec {
   version = "0";
   src = ./src;
   useDune2 = true;
-  buildInputs = [ ocaml-scylla ];
+  buildInputs = with ocamlPackages; [
+    ocaml-scylla
+    irmin
+    ppx_irmin
+    lwt_ppx
+  ];
 }
diff --git a/ocaml-scylla.nix b/ocaml-scylla.nix
@@ -5,10 +5,10 @@ with ocamlPackages;
 let pname = "scylla";
 
     repo = fetchFromGitHub {
-      owner = "anmolsahoo25";
+      owner = "gowthamk";
       repo = "ocaml-${pname}";
-      rev = "1781f065d913d629052fdf06605de1a727cf5601";
-      sha256 = "05yjhn9hvfjnmkc2m1xb2xch54p8jqy6jyz6qak3rpyrfcdxk778";
+      rev = "65e87bdb61bde19fe2f50f77a6dc88c978445c68";
+      sha256 = "1dn8xdjazkizk8ik8cg5kr6p9jjglw9j2w63iq5p26pkkb5fjfrh";
     };
 
 in

diff --git a/src/mergeDB.ml b/src/mergeDB.ml
@@ -153,6 +153,12 @@ module Make (Data : Content.TYPE) = struct
             in
             (* Update head of into_b to the new version. *)
             let _ = HeadMap.set db new_v in
+            (* Add new edges to version graph *)
+            let _ = VersionGraph.add_version
+                      db
+                      new_v
+                      [from_v; into_v]
+            in
             (* Update LCA between from_b and into_b, using from_b's head
                as LCA version. *)
             let _ = set_lca db from_b into_b from_v in