# # # patch "ChangeLog" # from [ee9225dd82d90d9afab02a5bdd7ead4c0d202b7d] # to [ca953ca6db828c5e165a2f1a5f9b04a4697c8873] # # patch "revision.cc" # from [6640272c7839f8489f1fe23813d7c520afc87d02] # to [dc9d63065b1efd2f3c53da2f6d19a685174e450d] # ============================================================ --- ChangeLog ee9225dd82d90d9afab02a5bdd7ead4c0d202b7d +++ ChangeLog ca953ca6db828c5e165a2f1a5f9b04a4697c8873 @@ -1,5 +1,11 @@ 2006-02-26 Nathaniel Smith + * revision.cc (parse_revision): Prepare for the future by giving a + more user-friendly error message on unknown format_version + strings. + +2006-02-26 Nathaniel Smith + * schema_migration.cc (migrate): Provide a little more feedback during migration, so it doesn't look like it's taking minutes and minutes just to "calculate necessary migration steps". ============================================================ --- revision.cc 6640272c7839f8489f1fe23813d7c520afc87d02 +++ revision.cc dc9d63065b1efd2f3c53da2f6d19a685174e450d @@ -1526,7 +1526,11 @@ std::string tmp; parser.esym(syms::format_version); parser.str(tmp); - I(tmp == "1"); + E(tmp == "1", + F("encountered a revision with unknown format, version '%s'\n" + "I only know how to understand the version '1' format\n" + "a newer version of monotone is required to complete this operation") + % tmp); parser.esym(syms::new_manifest); parser.hex(tmp); rev.new_manifest = manifest_id(tmp);