# # # patch "rcs_import.cc" # from [4413b986ab0488a9d440a94ee2b7c2e6527cd17a] # to [80b00310d52b6667c0ceaed5f04d9977d9f78531] # ============================================================ --- rcs_import.cc 4413b986ab0488a9d440a94ee2b7c2e6527cd17a +++ rcs_import.cc 80b00310d52b6667c0ceaed5f04d9977d9f78531 @@ -2531,10 +2531,7 @@ split_blob_at(cvs_history & cvs, const c split_blob_at(cvs_history & cvs, const cvs_blob_index blob_to_split, split_decider_func & split_decider); -void -explode_blob(cvs_history & cvs, const cvs_blob_index blob_to_split); - struct branch_sanitizer { protected: @@ -3431,7 +3428,6 @@ split_cycle(cvs_history & cvs, vector blob_without_type1_events; vector splittable_blobs; - vector type4_symbol_blobs; for (cm_ity cc = cycle_members.begin(); cc != cycle_members.end(); ++cc) { @@ -3511,8 +3507,6 @@ split_cycle(cvs_history & cvs, vector::const_iterator i = type4_symbol_blobs.begin(); - i != type4_symbol_blobs.end(); ++i) - explode_blob(cvs, *i); - } else { L(FL("Unable to split the cycle!")); @@ -3666,24 +3653,6 @@ void } void -explode_blob(cvs_history & cvs, const cvs_blob_index bi) -{ - L(FL(" exploding blob %d") % bi); - - // Reset the dependents both caches of the origin blob. - cvs.blobs[bi].reset_dependencies_cache(); - cvs.blobs[bi].reset_dependents_cache(); - - while (cvs.blobs[bi].get_events().size() > 1) - { - set tmp; - tmp.insert(*cvs.blobs[bi].get_events().rbegin()); - split_by_event_set func(tmp); - split_blob_at(cvs, bi, func); - } -} - -void split_blob_at(cvs_history & cvs, const cvs_blob_index blob_to_split, split_decider_func & split_decider) {