# # patch "cvs_client.cc" # from [c773608458a0af50889817a6789f30a8c59186a8] # to [3e07875fbabb5d5b90a69be2d8e7864319e68f13] # # patch "cvs_repository.cc" # from [776fa6d23bbc956ec57501eb12e5862c84c4580f] # to [8270d384c6db05c3ff874dcb5e0ff3aa52c5381f] # --- cvs_client.cc +++ cvs_client.cc @@ -684,8 +684,8 @@ time_t cvs_client::Entries2time_t(const std::string &t) { I(t.size()==24); - I(t[3]=' '); - I(t[7]=' '); + I(t[3]==' '); + I(t[7]==' '); std::vector parts; stringtok(parts,t); I(parts.size()==5); @@ -699,7 +699,7 @@ tm.tm_min=atoi(parts[3].substr(3,2).c_str()); tm.tm_sec=atoi(parts[3].substr(6,2).c_str()); tm.tm_isdst=-1; - return mktime(tm); + return mktime(&tm); } std::string cvs_client::time_t2rfc822(time_t t) --- cvs_repository.cc +++ cvs_repository.cc @@ -1643,7 +1643,7 @@ fs.keyword_substitution=parts[4]; // @@ import the file and check whether it is (un-)changed // fs.sha1sum=@@ - f.known_states.insert(fs); + f->second.known_states.insert(fs); } } }