# # # patch "rcs_import.cc" # from [7f6d0b7eef6bf60118d0ff6fce792c3f17560794] # to [b37cd8901e542fc34391860ef08245455ccfebbc] # ============================================================ --- rcs_import.cc 7f6d0b7eef6bf60118d0ff6fce792c3f17560794 +++ rcs_import.cc b37cd8901e542fc34391860ef08245455ccfebbc @@ -2655,6 +2655,25 @@ public: if (*ity_b == e.second) break; + // check for existing dependencies, both directions... + vector< cvs_blob_index > back_path; + insert_iterator< vector< cvs_blob_index > > + back_ity(back_path, back_path.end()); + + dijkstra_shortest_path(cvs, *ity_a, *ity_b, back_ity, + false, // upwards, + true, true, true, // follow all + false, + make_pair(invalid_blob, invalid_blob)); + I(back_path.empty()); + + dijkstra_shortest_path(cvs, *ity_a, *ity_b, back_ity, + true, // downwards, + true, true, true, // follow all + false, + make_pair(invalid_blob, invalid_blob)); + I(back_path.empty()); + L(FL(" adding dependency from blob %d to blob %d") % *ity_a % *ity_b); cvs.blobs[*ity_b].add_dependency_to(cvs.blobs[*ity_a]);