# 
# 
# patch "mtn_cvs/cvs_sync.cc"
#  from [25bfc31a4f3e3512d38a9532169869ddf010b5ba]
#    to [7f4e7cfef32fbb6a4d8861555e9fb357cb42b3ce]
# 
# patch "mtn_cvs/tests/takeover_modified/__driver__.lua"
#  from [22d28a0aae91cb5afaf03b27fd350d127a4ee6bd]
#    to [a318d95ee5abceac39bf60458b11f1a8f5827007]
# 
============================================================
--- mtn_cvs/cvs_sync.cc	25bfc31a4f3e3512d38a9532169869ddf010b5ba
+++ mtn_cvs/cvs_sync.cc	7f4e7cfef32fbb6a4d8861555e9fb357cb42b3ce
@@ -857,6 +857,7 @@ std::set<cvs_edge>::iterator cvs_reposit
     { commit_arg a;
       a.file=file_path(*i).as_internal();
       cvs_manifest::const_iterator old=parent_manifest.find(a.file);
+      if (a.file==".mtn-sync-"+app.domain()) continue;
       I(old!=parent_manifest.end());
       a.removed=true;
       a.old_revision=old->second->cvs_version;
@@ -899,6 +900,7 @@ std::set<cvs_edge>::iterator cvs_reposit
     { 
       commit_arg a;
       a.file=file_path(i->first).as_internal();
+      if (a.file==".mtn-sync-"+app.domain()) continue;
       a.new_content=app.get_file(i->second);
       commits.push_back(a);
       L(FL("add %s %d\n") % a.file % a.new_content.size());
@@ -910,6 +912,7 @@ std::set<cvs_edge>::iterator cvs_reposit
     { 
       commit_arg a;
       a.file=file_path(i->first).as_internal();
+      if (a.file==".mtn-sync-"+app.domain()) continue;
       cvs_manifest::const_iterator old=parent_manifest.find(a.file);
       I(old!=parent_manifest.end());
       a.old_revision=old->second->cvs_version;
@@ -1660,15 +1663,17 @@ void cvs_repository::takeover()
   // mtn setup .
   { std::vector<std::string> args;
     args.push_back(app.mtn_binary());
+    if (args[0].empty()) args[0]="mtn";
     for (std::vector<utf8>::const_iterator i=app.mtn_options.begin();i!=app.mtn_options.end();++i)
       args.push_back((*i)());
-    if (args[0].empty()) args[0]="mtn";
+    args.push_back("--branch");
+    args.push_back(app.branch());
     args.push_back("setup");
     args.push_back(".");
     I(args.size()<30);
     const char *argv[30];
     unsigned i=0;
-    for (;i<30;++i) argv[i]=args[i].c_str();
+    for (;i<30 && i<args.size();++i) argv[i]=args[i].c_str();
     argv[i]=0;
     process_spawn(argv);
   }
============================================================
--- mtn_cvs/tests/takeover_modified/__driver__.lua	22d28a0aae91cb5afaf03b27fd350d127a4ee6bd
+++ mtn_cvs/tests/takeover_modified/__driver__.lua	a318d95ee5abceac39bf60458b11f1a8f5827007
@@ -42,4 +42,4 @@ check(cvs("co", "test"), 0, false, false
 os.execute("mv test test.old")
 
 check(cvs("co", "test"), 0, false, false)
+check(sha1("test/B") == tsha2)
-check(sha1("test/B") == tsha1)