# # # patch "rcs_import.cc" # from [3e3f63788da29ea0f0cf45de72f9d430b0cf167b] # to [4413b986ab0488a9d440a94ee2b7c2e6527cd17a] # ============================================================ --- rcs_import.cc 3e3f63788da29ea0f0cf45de72f9d430b0cf167b +++ rcs_import.cc 4413b986ab0488a9d440a94ee2b7c2e6527cd17a @@ -3450,10 +3450,6 @@ split_cycle(cvs_history & cvs, vector & blob_events = cvs.blobs[*cc].get_events(); - for (blob_event_iter ity = blob_events.begin(); - ity != blob_events.end(); ++ity) - L(FL(" %s\t%s") % get_event_repr(cvs, *ity) - % date_t::from_unix_epoch((*ity)->adj_time / 100)); // skip blobs which consist of just one event, those cannot be // split any further anyway. @@ -3476,26 +3472,24 @@ split_cycle(cvs_history & cvs, vector::const_iterator mm_ity; - pair range = - in_cycle_dependencies.equal_range(this_ev); + pair range; // just count the number of in_cycle_dependencies from this event // to the cycle - while (range.first != range.second) - { - deps_from++; - range.first++; - } + range = in_cycle_dependencies.equal_range(this_ev); + for (; range.first != range.second; ++range.first) + deps_from++; // do the same counting for in_cycle_dependents, i.e. dependencies // from the cycle to this event range = in_cycle_dependents.equal_range(this_ev); - while (range.first != range.second) - { - deps_to++; - range.first++; - } + for (; range.first != range.second; ++range.first) + deps_to++; + L(FL(" %s\t%s\tfrom:%d\tto:%d") % get_event_repr(cvs, *ity) + % date_t::from_unix_epoch((*ity)->adj_time / 100) + % deps_from % deps_to); + if (deps_from == 0) { if (deps_to == 0)