# 
# 
# patch "ChangeLog"
#  from [a56b0f29be14645fcad278dc9d8757abbcea890b]
#    to [984b57ef7fb1d96de67bd16fdfcf18692ce56f84]
# 
# patch "revision.cc"
#  from [5949a0586ccb05cffd7ca576810d2aa51790bc5f]
#    to [59b042fe3932dd79b6d139803e934053528cc659]
# 
============================================================
--- ChangeLog	a56b0f29be14645fcad278dc9d8757abbcea890b
+++ ChangeLog	984b57ef7fb1d96de67bd16fdfcf18692ce56f84
@@ -1,3 +1,8 @@
+2006-03-14  Nathaniel Smith  <address@hidden>
+
+	* revision.cc (construct_revisions_from_ancestry): Now with 17%
+	more helpfulness.
+
 2006-03-12  Richard Levitte  <address@hidden>
 
 	Some of the monotone commands don't really need to use the data
============================================================
--- revision.cc	5949a0586ccb05cffd7ca576810d2aa51790bc5f
+++ revision.cc	59b042fe3932dd79b6d139803e934053528cc659
@@ -1261,8 +1261,10 @@
                                                     attr_key("mtn:" + key),
                                                     attr_value(k->second));
                             else
-                              E(false, F("unknown attribute %s on path %s\n"
-                                         "please contact %s so we can work out the right way to migrate this")
+                              E(false, F("unknown attribute '%s' on path '%s'\n"
+                                         "please contact %s so we can work out the right way to migrate this\n"
+                                         "(if you just want it to go away, see the switch --drop-attr, but\n"
+                                         "seriously, if you'd like to keep it, we're happy to figure out how")
                                 % key % file_path(sp) % PACKAGE_BUGREPORT);
                           }
                       }