# # # patch "rcs_import.cc" # from [621242d7921543edcac3ea2036bf3af80782530b] # to [eb15ccef0ee5fd53cd76048abbf7897057a50bfb] # ============================================================ --- rcs_import.cc 621242d7921543edcac3ea2036bf3af80782530b +++ rcs_import.cc eb15ccef0ee5fd53cd76048abbf7897057a50bfb @@ -909,20 +909,6 @@ process_rcs_branch(string const & begin_ } } - string next_version = r.deltas.find(curr_version)->second->next; - - if (!next_version.empty()) - { - L(FL("following RCS edge %s -> %s") % curr_version % next_version); - - construct_version(*curr_lines, next_version, *next_lines, r); - L(FL("constructed RCS version %s, inserting into database") % - next_version); - - insert_into_db(curr_data, curr_id, - *next_lines, next_data, next_id, db, dryrun); - } - // recursively follow any branch commits coming from the branchpoint shared_ptr curr_delta = r.deltas.find(curr_version)->second; for(set::const_iterator i = curr_delta->branches.begin(); @@ -1016,6 +1002,20 @@ process_rcs_branch(string const & begin_ add_dependencies(branch_event, last_events, reverse_import); } + string next_version = r.deltas.find(curr_version)->second->next; + + if (!next_version.empty()) + { + L(FL("following RCS edge %s -> %s") % curr_version % next_version); + + construct_version(*curr_lines, next_version, *next_lines, r); + L(FL("constructed RCS version %s, inserting into database") % + next_version); + + insert_into_db(curr_data, curr_id, + *next_lines, next_data, next_id, db, dryrun); + } + if (!r.deltas.find(curr_version)->second->next.empty()) { // advance