# 
# 
# patch "mtn_cvs/cvs_sync.cc"
#  from [18c2ba8a8dd7c2370729ba44565d64b1fb935806]
#    to [70917036d1056eeecaa1d143a001a5a7db163511]
# 
# patch "mtn_cvs/mtn_automate.cc"
#  from [7829ef02a593b0b42c2a573c640526345ba357b3]
#    to [5fd366d683a9410f48eb9479fdd6cf193f38f7b1]
# 
# patch "mtn_cvs/mtn_cvs.cc"
#  from [7f491597c2d8cce52dad3d6469f99005af03a19c]
#    to [cd184057e2497b47dc0e67e81754f63e72f0779b]
# 
============================================================
--- mtn_cvs/cvs_sync.cc	18c2ba8a8dd7c2370729ba44565d64b1fb935806
+++ mtn_cvs/cvs_sync.cc	70917036d1056eeecaa1d143a001a5a7db163511
@@ -976,7 +976,8 @@ std::string cvs_repository::gather_merge
 }
 
 std::string cvs_repository::gather_merge_information(revision_id const& id)
-{ std::vector<revision_id> parents=app.get_revision_parents(id);
+{ L(FL("gather_merge_information(%s)") % id);
+  std::vector<revision_id> parents=app.get_revision_parents(id);
   std::string result;
   for (std::vector<revision_id>::const_iterator i=parents.begin();i!=parents.end();++i)
   { if (*i==revision_id()) continue;
@@ -1131,6 +1132,8 @@ void cvs_sync::push(const std::string &_
 { cvs_repository *repo=cvs_sync::prepare_sync(_repository,_module,_branch,app);
   
   N(!repo->empty(),F("no revision certs for this repository/module\n"));
+  L(FL("push"));
+  std::cerr << repo->debug() << '\n';
   repo->commit();
   delete repo;
 }
============================================================
--- mtn_cvs/mtn_automate.cc	7829ef02a593b0b42c2a573c640526345ba357b3
+++ mtn_cvs/mtn_automate.cc	5fd366d683a9410f48eb9479fdd6cf193f38f7b1
@@ -60,7 +60,9 @@ std::vector<revision_id> mtn_automate::g
   piece::index_deltatext(children,lines);
   result.reserve(children.size());
   for (piece::piece_table::const_iterator p=lines.begin();p!=lines.end();++p)
-    result.push_back(revision_id((**p).substr(constants::idlen)));
+  { // L(FL("child '%s'") % (**p).substr(0,constants::idlen));
+    result.push_back(revision_id((**p).substr(0,constants::idlen)));
+  }
   piece::reset();
   return result;
 }
@@ -74,7 +76,7 @@ std::vector<revision_id> mtn_automate::g
   piece::index_deltatext(children,lines);
   result.reserve(children.size());
   for (piece::piece_table::const_iterator p=lines.begin();p!=lines.end();++p)
-    result.push_back(revision_id((**p).substr(constants::idlen)));
+    result.push_back(revision_id((**p).substr(0,constants::idlen)));
   piece::reset();
   return result;
 }
============================================================
--- mtn_cvs/mtn_cvs.cc	7f491597c2d8cce52dad3d6469f99005af03a19c
+++ mtn_cvs/mtn_cvs.cc	cd184057e2497b47dc0e67e81754f63e72f0779b
@@ -128,7 +128,8 @@ CMD(push, N_("network"), N_("[CVS-REPOSI
     if (args.size()==3) 
       branch=idx(args, 2)();
   }
-//  cvs_sync::push(repository,module,branch,myapp);
+  mtncvs_state &myapp=mtncvs_state::upcast(app);
+  cvs_sync::push(repository,module,branch,myapp);
 }
 
 CMD(takeover, N_("working copy"), N_("[CVS-MODULE]"),