# # # patch "mtn_cvs/cvs_sync_push.cc" # from [605dc95911f4584f28147eb362a7ab60ec257202] # to [01e66d6365f25e0195ce65718363acb2324baa86] # ============================================================ --- mtn_cvs/cvs_sync_push.cc 605dc95911f4584f28147eb362a7ab60ec257202 +++ mtn_cvs/cvs_sync_push.cc 01e66d6365f25e0195ce65718363acb2324baa86 @@ -69,8 +69,8 @@ std::string cvs_repository::gather_merge } } result+="-------------------\n" - +changelog+"\nmonotone "+author+" " - +cvs_client::time_t2rfc822(date)+" "+i->inner()()+"\n"; + +changelog+"\nmtn "+author+" " + +cvs_client::time_t2rfc822(date)+" "+encode_hexenc(i->inner()())+"\n"; result+=gather_merge_information(*i); } return result;