# 
# 
# patch "mtn_cvs/cvs_sync.cc"
#  from [4299b334b02300967082058f1844517b1a9794e9]
#    to [b955f0b710fbf75c526c1930cc5328f824d3d5e7]
# 
============================================================
--- mtn_cvs/cvs_sync.cc	4299b334b02300967082058f1844517b1a9794e9
+++ mtn_cvs/cvs_sync.cc	b955f0b710fbf75c526c1930cc5328f824d3d5e7
@@ -590,8 +590,12 @@ void cvs_repository::attach_sync_state(c
     mtn_automate::manifest_map::const_iterator f
           = oldmanifest.find(file_path(i->first.first));
     if (f==oldmanifest.end()) 
-    { cs.attrs_set[i->first]=i->second;
-      any_change=true;
+    { // only add attributes on existing nodes
+      if (cs.dirs_added.find(i->first.first)!=cs.dirs_added.end()
+          || cs.files_added.find(i->first.first)!=cs.files_added.end())
+      { cs.attrs_set[i->first]=i->second;
+        any_change=true;
+      }
     }
     else
     {
@@ -600,7 +604,6 @@ void cvs_repository::attach_sync_state(c
       if (a==f->second.second.end()) cs.attrs_set[i->first]=i->second;
       else if (a->second!=i->second)
       {
-//        cs.attrs_cleared.insert(i->first);
         cs.attrs_set[i->first]=i->second;
         any_change=true;
       }