# 
# 
# patch "cvs_sync.cc"
#  from [7af829d43ad0191cb399a2089dc09e9501488cd6]
#    to [2709956460ac900a91eaa6de43e9ab4201950028]
# 
============================================================
--- cvs_sync.cc	7af829d43ad0191cb399a2089dc09e9501488cd6
+++ cvs_sync.cc	2709956460ac900a91eaa6de43e9ab4201950028
@@ -1937,12 +1937,14 @@ void cvs_repository::migrate()
   std::cout << "#!/bin/sh\n"
     "DATABASE=mtn.db\n"
     "OLD_REVISION="<< e->revision() <<"\n"
-    "REVISION=`mtn -d$DATABASE automate select 'b:" << escape(app.branch_name()) 
+    "MTN=\"mtn\"\n"
+    "REVISION=`$MTN -d$DATABASE automate select 'b:" << escape(app.branch_name()) 
       << "/a:" << escape(e->author) << "/d:" << time_t2monotone(e->time) << "'`\n"
     "# remove newline character\n"
     "REVISION=`echo $REVISION`\n"
+    "echo revision $REVISION\n"
     "(echo -n 'l13:put_sync_info40:'$REVISION'"<< domain.size() << ':' 
-        << domain << "' ; cat <<EOF) | mtn -d$DATABASE automate stdio\n";
+        << domain << "' ; cat <<EOF) | $MTN -d$DATABASE automate stdio\n";
   // modules, root, repository, branch
   std::ostringstream str;
   basic_io::printer printer(str);
@@ -1954,7 +1956,12 @@ void cvs_repository::migrate()
   for (std::map<std::string,std::string>::const_iterator i=sd.begin();
         i!=sd.end();++i)
   { if (i->first.empty() || i->second!=root+"/"+module+"/")
+    { 
+      std::string local_path=i->first;
+      if (!local_path.empty() && local_path[local_path.size()-1]=='/')
+        local_path.erase(local_path.size()-1,1);
       print_attr(printer, i->first, domain+":path", i->second);
+    }
   }
   cvs_manifest m=get_files(*e);
   for (cvs_manifest::const_iterator i=m.begin(); i!=m.end(); ++i)