# # # patch "rcs_import.cc" # from [8080b72c3e77cf50a2753d3109e7426d2dc32a50] # to [dd8783177ff568d0208459ad6620fa57b46a26ad] # ============================================================ --- rcs_import.cc 8080b72c3e77cf50a2753d3109e7426d2dc32a50 +++ rcs_import.cc dd8783177ff568d0208459ad6620fa57b46a26ad @@ -2186,6 +2186,8 @@ public: set done; stack stack; + I(!path.empty()); + // start at the event given and recursively check all its // dependencies for blobs in the path. for (dep_loop i = cvs.get_dependencies(ev); !i.ended(); ++i) @@ -2195,6 +2197,7 @@ public: // done. If we hit one of those, we don't have to go // further. cvs_blob & first_blob = cvs.blobs[*path.begin()]; + I(first_blob.get_events().size() > 1); for (blob_event_iter i = first_blob.begin(); i != first_blob.end(); ++i) for (dep_loop j = cvs.get_dependencies(*i); !j.ended(); ++j) { @@ -3037,6 +3040,9 @@ split_blob_at(cvs_history & cvs, const c L(FL("splitting blob %d") % bi); + // make sure we can split the blob + I(cvs.blobs[bi].get_events().size() > 1); + // Add a blob cvs_blob_index new_bi = cvs.add_blob(cvs.blobs[bi].etype, cvs.blobs[bi].symbol)->second;