#
#
# patch "database.cc"
#  from [9c98242a5b86fdd29ab5d2ce8e36b80970985a71]
#    to [f86a205c12f71516a862478efeb371f6e4fb48da]
# 
# patch "graph.cc"
#  from [fc6bcec20a325cc94d936a718437558e0489078d]
#    to [321bc48c571ca17ccce0045b5edbda76688191eb]
#
============================================================
--- database.cc	9c98242a5b86fdd29ab5d2ce8e36b80970985a71
+++ database.cc	f86a205c12f71516a862478efeb371f6e4fb48da
@@ -1876,7 +1876,7 @@ database::get_leaves(set<revision_id> & 
               "ON revisions.id = revision_ancestry.parent "
               "WHERE revision_ancestry.child IS null"));
   for (size_t i = 0; i < res.size(); ++i)
-    leaves.insert(revision_id(res[i][0]));
+    leaves.insert(revision_id(encode_hexenc(res[i][0])));
 }
 
 
============================================================
--- graph.cc	fc6bcec20a325cc94d936a718437558e0489078d
+++ graph.cc	321bc48c571ca17ccce0045b5edbda76688191eb
@@ -173,7 +173,12 @@ make_random_reconstruction_graph(size_t 
                                  randomizer & rng)
 {
   for (size_t i = 0; i != num_nodes; ++i)
-    all_nodes.push_back(hexenc<id>(lexical_cast<string>(i)));
+    {
+      hexenc<id> hex_id;
+      string s(lexical_cast<string>(i));
+      calculate_ident(data(s), hex_id);
+      all_nodes.push_back(hex_id);
+    }
   // We put a single long chain of edges in, to make sure that everything is
   // reconstructable somehow.
   for (size_t i = 1; i != num_nodes; ++i)