From: David Cock <david.cock@inf.ethz.ch>
Date: Mon, 24 Aug 2015 08:23:18 +0000 (+0200)
Subject: TreeDB merge operation
X-Git-Tag: release2015-09-03~31
X-Git-Url: http://git.barrelfish.org/?p=barrelfish;a=commitdiff_plain;h=091df721a45b9501e596df374064e69ce52bfde8

TreeDB merge operation

Signed-off-by: David Cock <david.cock@inf.ethz.ch>
---

diff --git a/hake/TreeDB.hs b/hake/TreeDB.hs
index 1114123..9ee61f9 100644
--- a/hake/TreeDB.hs
+++ b/hake/TreeDB.hs
@@ -4,7 +4,7 @@ module TreeDB(
 
     TreeDB,
     tdbEmpty, tdbByDir, tdbAdd, tdbAddDir,
-    tdbBuild,
+    tdbBuild, tdbMerge,
 
     tdbByDirExt, tdbByDirExts
     )
@@ -100,6 +100,9 @@ tdbAddDir dir files treeDB
 tdbBuild :: [FilePath] -> TreeDB
 tdbBuild files = foldr tdbAdd tdbEmpty files
 
+tdbMerge :: TreeDB -> TreeDB -> TreeDB
+tdbMerge = T.unionL
+
 --
 -- Combined queries
 --