# 
# 
# patch "revision.cc"
#  from [5e0f1237d50c8f318b6a73102446e46646d867d5]
#    to [1c1ce2a3031329266ecbfd97afe88f7cb5cbdf84]
# 
============================================================
--- revision.cc	5e0f1237d50c8f318b6a73102446e46646d867d5
+++ revision.cc	1c1ce2a3031329266ecbfd97afe88f7cb5cbdf84
@@ -1242,9 +1242,18 @@
                         for (std::map<std::string, std::string>::const_iterator
                                k = fattrs.begin();
                              k != fattrs.end(); ++k)
-                          child_roster.set_attr(sp,
-                                                attr_key(k->first),
-                                                attr_value(k->second));
+                          {
+                            std::string key = k->first;
+                            if (key == "execute" || key == "manual_merge")
+                              key = "mtn:" + key;
+                            else
+                              E(F("unknown attribute %s on path %s\n"
+                                  "please contact %s so we can work out the right way to migrate this")
+                                key % file_path(sp) % PACKAGE_BUGREPORT);
+                            child_roster.set_attr(sp,
+                                                  attr_key(key),
+                                                  attr_value(k->second));
+                          }
                       }
                   }
               }