# 
# 
# patch "database.cc"
#  from [0ec3057bf99eeac3e535f719f33021881c1e36ec]
#    to [3510d3a52054d8398692981570f3e117869a688b]
# 
# patch "schema_migration.cc"
#  from [dbcd8a559637dd52b608e6c6e8cd390a45941552]
#    to [9e5f0d5ecd5f92746b54ed66a85ed9b115c6c94d]
# 
============================================================
--- database.cc	0ec3057bf99eeac3e535f719f33021881c1e36ec
+++ database.cc	3510d3a52054d8398692981570f3e117869a688b
@@ -119,7 +119,7 @@
   // (the id you need was printed in the error message you got when you 
   // ran monotone without updating this.)
   //
-  schema("0a5615e37448e0671655afe4c536cc45680fbcc4"),
+  schema("ddde37049c50445ee2b7f10a711034978daf5cc5"),
   __sql(NULL),
   transaction_level(0)
 {}
@@ -521,6 +521,7 @@
       "  file deltas     : %u\n"
       "  revisions       : %u\n"
       "  ancestry edges  : %u\n"
+      "  file ancestry   : %u\n"
       "  certs           : %u\n"
       "bytes:\n"
       "  full rosters    : %u\n"
@@ -529,6 +530,7 @@
       "  file deltas     : %u\n"
       "  revisions       : %u\n"
       "  cached ancestry : %u\n"
+      "  file ancestry   : %u\n"
       "  certs           : %u\n"
       "  total           : %u\n"
       )
@@ -540,6 +542,7 @@
     % count("file_deltas")
     % count("revisions")
     % count("revision_ancestry")
+    % count("node_revision_ancestry")
     % count("revision_certs")
     // bytes
     % SPACE_USAGE("rosters", "length(id) + length(data)")
@@ -548,6 +551,7 @@
     % SPACE_USAGE("file_deltas", "length(id) + length(base) + length(delta)")
     % SPACE_USAGE("revisions", "length(id) + length(data)")
     % SPACE_USAGE("revision_ancestry", "length(parent) + length(child)")
+    % SPACE_USAGE("node_revision_ancestry", "length(node) + length(parent) + length(child)")
     % SPACE_USAGE("revision_certs", "length(hash) + length(id) + length(name)"
                   " + length(value) + length(keypair) + length(signature)")
     % total;
@@ -1424,7 +1428,7 @@
   results res;
   graph.clear();
   fetch(res, 2, any_rows, 
-        "SELECT parent,child FROM node_revision_ancestry WHERE node = ?", lexical_cast<string>(node).c_str());
+        query("SELECT parent,child FROM node_revision_ancestry WHERE node = ?") % text(lexical_cast<string>(node)));
   for (size_t i = 0; i < res.size(); ++i)
       graph.insert(std::make_pair(revision_id(res[i][0]),
                                   revision_id(res[i][1])));
@@ -1437,8 +1441,7 @@
   results res;
   parents.clear();
   fetch(res, one_col, any_rows,
-        "SELECT parent from node_revision_ancestry WHERE node = ? AND child = ?",
-        lexical_cast<string>(node).c_str(), rev.inner()().c_str());
+        query("SELECT parent from node_revision_ancestry WHERE node = ? AND child = ?") % text(lexical_cast<string>(node)) % text(rev.inner()().c_str()));
   for (size_t i = 0; i < res.size(); i++)
     parents.insert(revision_id(res[i][0]));
 }
@@ -1450,8 +1453,7 @@
   results res;
   children.clear();
   fetch(res, one_col, any_rows,
-        "SELECT child from node_revision_ancestry WHERE node = ? AND parent = ?",
-        lexical_cast<string>(node).c_str(), rev.inner()().c_str());
+        query("SELECT child from node_revision_ancestry WHERE node = ? AND parent = ?") % text(lexical_cast<string>(node)) % text(rev.inner()().c_str()));
   for (size_t i = 0; i < res.size(); i++)
     children.insert(revision_id(res[i][0]));
 }
@@ -2686,9 +2688,8 @@
 void
 database::put_node_revision_ancestry(node_id node, revision_id const & parent, revision_id const & child)
 {
-  execute("INSERT into node_revision_ancestry VALUES (?, ?, ?)",
-          lexical_cast<string>(node).c_str(),
-          parent.inner()().c_str(), child.inner()().c_str());
+  execute(query("INSERT into node_revision_ancestry VALUES (?, ?, ?)") %
+          text(lexical_cast<string>(node)) % text(parent.inner()()) % text(child.inner()()));
 }
 
 
============================================================
--- schema_migration.cc	dbcd8a559637dd52b608e6c6e8cd390a45941552
+++ schema_migration.cc	9e5f0d5ecd5f92746b54ed66a85ed9b115c6c94d
@@ -1091,18 +1091,12 @@
   m.add("1db80c7cee8fa966913db1a463ed50bf1b0e5b0e",
         &migrate_files_BLOB);
 
-  //m.add("1db80c7cee8fa966913db1a463ed50bf1b0e5b0e",
-  //      &migrate_client_to_per_file_dag);
+  m.add("9d2b5d7b86df00c30ac34fe87a3c20f1195bb2df",
+        &migrate_client_to_per_file_dag);
 
   // IMPORTANT: whenever you modify this to add a new schema version, you must
   // also add a new migration test for the new schema version.  See
   // tests/t_migrate_schema.at for details.
 
-  //<<<<<<< variant A
-  //m.migrate(sql, "9d2b5d7b86df00c30ac34fe87a3c20f1195bb2df");
-  //>>>>>>> variant B
-  //m.migrate(sql, "0a5615e37448e0671655afe4c536cc45680fbcc4");
-  //####### Ancestor
-  //m.migrate(sql, "1db80c7cee8fa966913db1a463ed50bf1b0e5b0e");
-  //======= end
+  m.migrate(sql, "ddde37049c50445ee2b7f10a711034978daf5cc5");
 }