# # # patch "revision.cc" # from [0f62e7efffece6e153c8da0c3a1d64e9d4b13f0c] # to [2eb518bf1080b7633b9f119e695888b4909c3059] # ============================================================ --- revision.cc 0f62e7efffece6e153c8da0c3a1d64e9d4b13f0c +++ revision.cc 2eb518bf1080b7633b9f119e695888b4909c3059 @@ -1138,16 +1138,20 @@ { // Set up the parent->child mapping and prime the work queue - std::set parents, children; + std::set children, all; for (std::multimap::const_iterator i = ancestry.begin(); i != ancestry.end(); ++i) { parent_to_child_map.insert(std::make_pair(i->second, i->first)); children.insert(i->first); - parents.insert(i->second); } + for (std::map::const_iterator i = node_to_old_man.begin(); + i != node_to_old_man.end(); ++i) + { + all.insert(i->first); + } - set_difference(parents.begin(), parents.end(), + set_difference(all.begin(), all.end(), children.begin(), children.end(), std::back_inserter(work)); } @@ -1399,8 +1403,13 @@ graph.add_node_ancestry(child_node, parent_node); } } - I(all_rev_ids.empty()); + for (std::set::const_iterator i = all_rev_ids.begin(); + i != all_rev_ids.end(); ++i) + { + u64 node = graph.add_node_for_oldstyle_revision(*i); + } + global_sanity.set_relaxed(false); graph.rebuild_ancestry(); }