# # # patch "rcs_import.cc" # from [5c39b1bd95a5ecc0f769233bdeb8ad6281c85b41] # to [ab44e3a961a57d6c546f517abd60064610827a55] # ============================================================ --- rcs_import.cc 5c39b1bd95a5ecc0f769233bdeb8ad6281c85b41 +++ rcs_import.cc ab44e3a961a57d6c546f517abd60064610827a55 @@ -1010,7 +1010,8 @@ process_rcs_branch(string const & begin_ // Make the last commit depend on this branch, so that this // commit action certainly comes after the branch action. See // the comment above for tags. - add_dependencies(branch_event, last_events, reverse_import); + if (!is_vendor_branch) + add_dependencies(branch_event, last_events, reverse_import); } if (!r.deltas.find(curr_version)->second->next.empty()) @@ -2384,8 +2385,6 @@ blob_consumer::consume_blob(cvs_blob_ind shared_ptr ce = boost::static_pointer_cast(*blob.begin()); - if (ce->alive) - { revision_id parent_rid, child_rid; parent_rid = bstate.current_rid; @@ -2409,7 +2408,6 @@ blob_consumer::consume_blob(cvs_blob_ind preps.push_back(prepared_revision(child_rid, rev, in_branch, blob)); bstate.current_rid = child_rid; - } } else if (blob.get_digest().is_branch()) {