# # # patch "rcs_import.cc" # from [46f0070053f2dc4ff860ac7a30bfab591fbb3778] # to [a68ac9120ab7e406e204ed822f6d173c4b4c4866] # ============================================================ --- rcs_import.cc 46f0070053f2dc4ff860ac7a30bfab591fbb3778 +++ rcs_import.cc a68ac9120ab7e406e204ed822f6d173c4b4c4866 @@ -1248,9 +1248,24 @@ add_blob_dependency_edges(shared_ptrget_blob((*dep)->get_digest(), false); - L(FL("blob %d depends on blob %d") % i % k->second); - add_edge(i, k->second, g); + for ( ; (branch->blobs[k->second].get_digest() == (*dep)->get_digest()); ++k) + { + bool found = false; + + for (dependency_iter di = branch->blobs[k->second].get_events().begin(); + di != branch->blobs[k->second].get_events().end(); ++ di) + { + if (*di == *dep) + found = true; + } + + if (found) + { + L(FL("blob %d depends on blob %d") % i % k->second); + add_edge(i, k->second, g); + } + } } } }