# # # patch "rcs_import.cc" # from [77baeff108505ed0d5927337e0d204cd2a7bac1a] # to [a2a9977e5bebd301b32ebde6daa5ded8395378e1] # ============================================================ --- rcs_import.cc 77baeff108505ed0d5927337e0d204cd2a7bac1a +++ rcs_import.cc a2a9977e5bebd301b32ebde6daa5ded8395378e1 @@ -2355,19 +2355,19 @@ public: { while (1) { - vector cross_path; - insert_iterator< vector< cvs_blob_index > > - ity_c(cross_path, cross_path.end()); + vector cross_path; + insert_iterator< vector< cvs_blob_index > > + ity_c(cross_path, cross_path.end()); - dijkstra_shortest_path(cvs, *(++path_a.rbegin()), *(++path_b.begin()), - ity_c, - false, // upwards - true, true, true, // follow all colors - false, - make_pair(invalid_blob, invalid_blob)); + dijkstra_shortest_path(cvs, *(++path_a.rbegin()), *(++path_b.begin()), + ity_c, + false, // upwards + true, true, true, // follow all colors + false, + make_pair(invalid_blob, invalid_blob)); - if (cross_path.empty()) - break; + if (cross_path.empty()) + break; #ifdef DEBUG_BLOB_SPLITTER L(FL(" found cross path:"));