#
#
# patch "database.cc"
#  from [20eb1ac9c66a57ac124f1624395fec97dcfc810a]
#    to [26823fb71c06adf8194ed261513d7fe268d0c77d]
# 
# patch "rev_types.hh"
#  from [b737aea93821772121ad0e197346a492b01ad291]
#    to [9a3a1a69643278a8b2c5c6c85d25623ae079227c]
#
============================================================
--- database.cc	20eb1ac9c66a57ac124f1624395fec97dcfc810a
+++ database.cc	26823fb71c06adf8194ed261513d7fe268d0c77d
@@ -1620,7 +1620,7 @@ database_impl::get_version(id const & id
 
   I(!selected_path.empty());
 
-  id curr = id(selected_path.back());
+  id curr = selected_path.back();
   selected_path.pop_back();
   data begin;
 
@@ -1785,7 +1785,7 @@ database_impl::extract_from_deltas(revis
       if (i > 0)
         {
           roster_delta del;
-          get_roster_delta(target_rev, *p, del);
+          get_roster_delta(target_rev, id(*p), del);
           bool found = x.look_at_delta(del);
           if (found)
             return;
@@ -1799,7 +1799,7 @@ database_impl::extract_from_deltas(revis
           x.look_at_roster(roster, mm);
           return;
         }
-      target_rev = *p;
+      target_rev = id(*p);
       ++i;
     }
 }
@@ -1845,7 +1845,7 @@ database::get_roster_version(revision_id
     get_reconstruction_path(ros_id.inner(), graph, selected_path);
   }
 
-  id curr = selected_path.back();
+  id curr(selected_path.back());
   selected_path.pop_back();
   // we know that this isn't already in the cache (because of the early exit
   // above), so we should create new objects and spend time filling them in.
@@ -1856,7 +1856,7 @@ database::get_roster_version(revision_id
   for (reconstruction_path::reverse_iterator i = selected_path.rbegin();
        i != selected_path.rend(); ++i)
     {
-      id const nxt = *i;
+      id const nxt(*i);
       if (global_sanity.debug_p())
         L(FL("following delta %s -> %s")
           % encode_hexenc(curr())
============================================================
--- rev_types.hh	b737aea93821772121ad0e197346a492b01ad291
+++ rev_types.hh	9a3a1a69643278a8b2c5c6c85d25623ae079227c
@@ -39,7 +39,7 @@ struct reconstruction_graph;
 // full definitions in graph.hh
 struct rev_graph;
 struct reconstruction_graph;
-typedef std::vector<std::string> reconstruction_path;
+typedef std::vector<id> reconstruction_path;
 typedef std::multimap<revision_id, revision_id> rev_ancestry_map;
 
 // full definitions in paths.hh