# # patch "ChangeLog" # from [91831d0929ca5b895ee1be65476ff99b7b59d881] # to [90667f9ed1d88e1dd2bb4b7ba68ecb002fdb666a] # # patch "manifest.cc" # from [01be2c10947f302d4710f6c971632e471e95120f] # to [51bdafd0a76234da858cc479e7d4c99ddf90527c] # =============================================== --- ChangeLog 91831d0929ca5b895ee1be65476ff99b7b59d881 +++ ChangeLog 90667f9ed1d88e1dd2bb4b7ba68ecb002fdb666a @@ -1,3 +1,8 @@ +2005-08-04 Nathaniel Smith + + * manifest.cc (build_restricted_manifest_map): In 'missing files' + error message, explain how to recover. + 2005-08-03 Nathaniel Smith * testsuite.at (NETSYNC_ADDRESS): New macro. =============================================== --- manifest.cc 01be2c10947f302d4710f6c971632e471e95120f +++ manifest.cc 51bdafd0a76234da858cc479e7d4c99ddf90527c @@ -198,7 +198,11 @@ } N(missing_files == 0, - F("%d missing files\n") % missing_files); + F("%d missing files\n" + "to restore consistency, on each missing file run either\n" + "'monotone drop FILE' to remove it permanently, or\n" + "'monotone revert FILE' to restore it\n") + % missing_files); }