# # # patch "rcs_import.cc" # from [eacbb71cd7d4733e1971331c89201b4c3ce03340] # to [3ac086720db62d6994b544d9ff823c2bdca6883b] # ============================================================ --- rcs_import.cc eacbb71cd7d4733e1971331c89201b4c3ce03340 +++ rcs_import.cc 3ac086720db62d6994b544d9ff823c2bdca6883b @@ -2368,6 +2368,16 @@ public: break; } + for (vector::iterator i = ++path_b.begin(); + i != path_b.end(); ++i) + if (cvs.blobs[*i].get_digest().is_branch_start()) + { + L(FL("path b contains a branch blob: %d (%s)") % *i % get_event_repr(cvs, *cvs.blobs[*i].begin())); + b_has_branch = true; + first_branch_start_in_path_b = i; + break; + } + #ifdef DEBUG_GRAPHVIZ { set blobs_to_show; @@ -2382,16 +2392,6 @@ public: } #endif - for (vector::iterator i = ++path_b.begin(); - i != path_b.end(); ++i) - if (cvs.blobs[*i].get_digest().is_branch_start()) - { - L(FL("path b contains a branch blob: %d (%s)") % *i % get_event_repr(cvs, *cvs.blobs[*i].begin())); - b_has_branch = true; - first_branch_start_in_path_b = i; - break; - } - // Swap a and b, if only b has a branch, but not a. This reduces // to three cases: no branches, only a has a branch and both // paths contain branches.