# # # patch "rcs_import.cc" # from [890f0c750274ece1ea7a9060d68b3c7203b0e887] # to [e716aeaaed3c24de253e81cffe2b18fa4bc9f6ac] # ============================================================ --- rcs_import.cc 890f0c750274ece1ea7a9060d68b3c7203b0e887 +++ rcs_import.cc e716aeaaed3c24de253e81cffe2b18fa4bc9f6ac @@ -2349,22 +2349,17 @@ public: I(e.first != e.second); - // We run Dijkstra's algorithm to find the shortest path from e.second - // to e.first. All vertices in that path are part of the smallest - // cycle which includes this back edge. To speed things up a bit, we - // do not take blobs into account, which have not been seen by the - // proceeding depth first search run, because those cannot possibly be - // part of the cycle (thus we only consider blobs marked grey or black). - insert_iterator< set< cvs_blob_index > > - ity(cycle_members, cycle_members.begin()); - - // to be extra sure... I((cvs.blobs[e.second].color == grey) || (cvs.blobs[e.second].color == black)); I(cvs.blobs[e.first].color == grey); + // We run Dijkstra's algorithm to find the shortest path from e.second + // to e.first. All vertices in that path are part of the smallest + // cycle which includes this back edge. + insert_iterator< set< cvs_blob_index > > + ity(cycle_members, cycle_members.begin()); dijkstra_shortest_path(cvs, e.first, e.second, ity, - false, true, true, // follow grey and black + true, true, true, // follow all blobs false, make_pair(invalid_blob, invalid_blob), 0);