From e55db243fe30e48eeadd33f1c38c6756977a2792 Mon Sep 17 00:00:00 2001
From: octalsrc <nicklewchenko92@gmail.com>
Date: Tue, 2 Nov 2021 16:15:38 -0600
Subject: [PATCH] Fix pull, so that edges are added to version graph

---
 mergedb.nix      | 7 ++++++-
 ocaml-scylla.nix | 6 +++---
 src/mergeDB.ml   | 6 ++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mergedb.nix b/mergedb.nix
index 0a780ed..ed3f8ad 100644
--- 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
index 295fe85..4de1b03 100644
--- 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
index 0133f81..81bddbf 100644
--- 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