# 
# patch "cvs_client.cc"
#  from [ac18768a428a1e5d9b2bc83a89970e87cdbbd3b7]
#    to [003c0c91270eb17d49689d611b223831861ee40b]
# 
# patch "cvs_repository.cc"
#  from [a323db15d874bae244d3de10c5483f76e84a6ece]
#    to [24e0671f09dcda298120a3c8d36c6eae060a4961]
# 
========================================================================
--- cvs_client.cc	ac18768a428a1e5d9b2bc83a89970e87cdbbd3b7
+++ cvs_client.cc	003c0c91270eb17d49689d611b223831861ee40b
@@ -684,7 +684,8 @@
   {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
   struct tm *tm=gmtime(&t);
   I(tm);
-  return (F("%02d %s %d %02d:%02d:%02d +0000") 
+  // do _not_ translate this into locale format (e.g. F() )
+  return (boost::format("%02d %s %d %02d:%02d:%02d +0000") 
     % tm->tm_mday % months[tm->tm_mon] % (tm->tm_year+1900)
     % tm->tm_hour % tm->tm_min % tm->tm_sec).str();
 }
========================================================================
--- cvs_repository.cc	a323db15d874bae244d3de10c5483f76e84a6ece
+++ cvs_repository.cc	24e0671f09dcda298120a3c8d36c6eae060a4961
@@ -1202,6 +1202,7 @@
       decode_base64(j->inner().value, value);
       if (value().size()<to_match.size()) continue;
       if (value().substr(0,to_match.size())!=to_match) continue;
+      break;
     }
     // this revision is already in _this_ repository
     if (j!=certs.end()) continue;
@@ -1224,6 +1225,7 @@
     result+="\n-------------------\n"
         "Monotone revision "+i->inner()()+" author "+author
         +" time "+cvs_client::time_t2rfc822(date)+"\n\n"+changelog;
+    result+=gather_merge_information(*i);
   }
   return result;
 }