# # # patch "rcs_import.cc" # from [59c142bf2d9ba22ef128d7f7ec9261d43165addc] # to [efdb129c1197bc8ac4327afcf9bdd04adb9402ba] # ============================================================ --- rcs_import.cc 59c142bf2d9ba22ef128d7f7ec9261d43165addc +++ rcs_import.cc efdb129c1197bc8ac4327afcf9bdd04adb9402ba @@ -1110,16 +1110,12 @@ cvs_history::push_branch(string const & string bname = base_branch + "." + branch_name; I(stk.size() > 0); + // Private branches will be split up later. The semicolon is + // hopefully an illegal character for CVS branch names if (private_branch) + bname = ";NONAME"; + { - cvs_branchname bn = branchname_interner.intern(""); - branch = shared_ptr(new cvs_branch(bn)); - stk.push(branch); - bstk.push(bn); - return; - } - else - { cvs_branchname bn = branchname_interner.intern(bname); map >::const_iterator b = branches.find(bn);