# # # patch "cvs_sync.cc" # from [ce1b7af383279f1cca9a123efdd32df20f1667b8] # to [648312da5fad419c5976ca3414eec32a3e91f607] # ============================================================ --- cvs_sync.cc ce1b7af383279f1cca9a123efdd32df20f1667b8 +++ cvs_sync.cc 648312da5fad419c5976ca3414eec32a3e91f607 @@ -892,11 +892,11 @@ // FIXME: look for this edge already in the database if (edges.begin()!=edges.end()) root_time=edges.begin()->time-1; std::set::iterator root_edge - =edges.insert(cvs_edge(branch+" branching point",root_time,repo.app.signing_key())).second; + =edges.insert(cvs_edge(branch+" branching point",root_time,app.signing_key())).first; for (std::map::const_iterator i=branch_point.begin();i!=branch_point.end();++i) { file_state fs(root_edge->time,i->second.get_string()); fs.log_msg=root_edge->changelog; - fs.autorh=root_edge->author; + fs.author=root_edge->author; files[i->first].known_states.insert(fs); } }