# 
# 
# patch "mtn_cvs/cvs_sync.cc"
#  from [6cdac1228e3e742f16256f958faf48927d56a8eb]
#    to [34a1de41fd1d5baa04543a0c46b4c14b09597ff3]
# 
# patch "mtn_cvs/mtn_automate.cc"
#  from [d8da6a560890af80d24229eb09e2727d7f6dfd58]
#    to [c252fa47c7ba2809faf0efe5ddab59791420a63c]
# 
============================================================
--- mtn_cvs/cvs_sync.cc	6cdac1228e3e742f16256f958faf48927d56a8eb
+++ mtn_cvs/cvs_sync.cc	34a1de41fd1d5baa04543a0c46b4c14b09597ff3
@@ -169,7 +169,7 @@ mtn_automate::sync_map_t cvs_repository:
   split_path sp(1,the_null_component);
   result[std::make_pair(sp,app.opts.domain()+":root")]= host+":"+root;
   result[std::make_pair(sp,app.opts.domain()+":module")]= module;
-  if (branch.empty())
+  if (!branch.empty())
     result[std::make_pair(sp,app.opts.domain()+":branch")]= branch;
   return result;
 }
============================================================
--- mtn_cvs/mtn_automate.cc	d8da6a560890af80d24229eb09e2727d7f6dfd58
+++ mtn_cvs/mtn_automate.cc	c252fa47c7ba2809faf0efe5ddab59791420a63c
@@ -158,6 +158,15 @@ static void print_cset(basic_io::printer
       printer.print_stanza(st);
     }
 
+  for (std::map<split_path, split_path>::const_iterator i = cs.nodes_renamed.begin();
+       i != cs.nodes_renamed.end(); ++i)
+    {
+      basic_io::stanza st;
+      st.push_file_pair(syms::rename_node, file_path(i->first));
+      st.push_file_pair(syms::to, file_path(i->second));
+      printer.print_stanza(st);
+    }
+
   for (path_set::const_iterator i = cs.dirs_added.begin();
        i != cs.dirs_added.end(); ++i)
     {
@@ -184,6 +193,25 @@ static void print_cset(basic_io::printer
       st.push_hex_pair(syms::to, i->second.second.inner());
       printer.print_stanza(st);
     }
+
+  for (std::set<std::pair<split_path, attr_key> >::const_iterator i = cs.attrs_cleared.begin();
+       i != cs.attrs_cleared.end(); ++i)
+    {
+      basic_io::stanza st;
+      st.push_file_pair(syms::clear, file_path(i->first));
+      st.push_str_pair(syms::attr, i->second());
+      printer.print_stanza(st);
+    }
+
+  for (std::map<std::pair<split_path, attr_key>, attr_value>::const_iterator i = cs.attrs_set.begin();
+       i != cs.attrs_set.end(); ++i)
+    {
+      basic_io::stanza st;
+      st.push_file_pair(syms::set, file_path(i->first.first));
+      st.push_str_pair(syms::attr, i->first.second());
+      st.push_str_pair(syms::value, i->second());
+      printer.print_stanza(st);
+    }
 }
 
 revision_id mtn_automate::put_revision(revision_id const& parent, cset const& changes)