# 
# 
# patch "automate.cc"
#  from [2a238a893740fcd4ae0f668eb9230c1d52952977]
#    to [050d243e7841e77f9c498f4608710457d59cbe40]
# 
# patch "mtn_cvs/mtn_cvs.cc"
#  from [ee48a735568e20cb25300dd28407642869608e45]
#    to [64a9b51a3148ac1f78b531d2a406e98da59319b7]
# 
============================================================
--- automate.cc	2a238a893740fcd4ae0f668eb9230c1d52952977
+++ automate.cc	050d243e7841e77f9c498f4608710457d59cbe40
@@ -1998,7 +1998,7 @@ AUTOMATE(put_sync_info, N_("REVISION DOM
       L(FL("sync info encoded as delta from %s") % edge_old_revision(e));
       return;
     }
-    catch (std::informative_failure &er) {}
+    catch (informative_failure &er) {}
     catch (std::runtime_error &er) {}
   }
   cert_value cv=xform<Botan::Gzip_Compression>(string(constants::idlen,' ')+new_data);
============================================================
--- mtn_cvs/mtn_cvs.cc	ee48a735568e20cb25300dd28407642869608e45
+++ mtn_cvs/mtn_cvs.cc	64a9b51a3148ac1f78b531d2a406e98da59319b7
@@ -137,7 +137,8 @@ CMD(takeover, N_("working copy"), N_("[C
   std::string module;
   if (args.size() == 1) module = idx(args, 0)();
   N(!app.branch_name().empty(), F("no destination branch specified\n"));
-//  cvs_sync::takeover(myapp, module);
+  mtncvs_state &myapp=mtncvs_state::upcast(app);
+  cvs_sync::takeover(myapp, module);
 }
 
 void