# 
# patch "ChangeLog"
#  from [ed9d285cad976debcb863b0523c3aa57a05a21ea]
#    to [5780bb39cf7a0806d9faeb41bdad56a01cbc5336]
# 
# patch "commands.cc"
#  from [755e27d10e9737caf42ab7f9243b56971a5f2d36]
#    to [081564ffe5fcfc9755683c86f94f4f24fdd7dc18]
# 
===============================================
--- ChangeLog	ed9d285cad976debcb863b0523c3aa57a05a21ea
+++ ChangeLog	5780bb39cf7a0806d9faeb41bdad56a01cbc5336
@@ -1,5 +1,7 @@
 2005-07-23  Matthew Gregan  <address@hidden>
 
+	* commands.cc (CMD(annotate)): Check for a valid revision before
+	trying to fetch it from the database.
 	* lua/lundump.[ch], lua/ldump.c: Rename VERSION and VERSION0 to
 	LUA_DUMP_VERSION and LUA_DUMP_VERSION0 to avoid clashes with
 	VERSION from config.h.
===============================================
--- commands.cc	755e27d10e9737caf42ab7f9243b56971a5f2d36
+++ commands.cc	081564ffe5fcfc9755683c86f94f4f24fdd7dc18
@@ -3604,6 +3604,9 @@
   else 
     complete(app, idx(app.revision_selectors, 0)(), rid);
 
+  N(!null_id(rid), F("no revision for file '%s' in database") % file);
+  N(app.db.revision_exists(rid), F("no such revision '%s'") % rid);
+
   L(F("annotate file file_path '%s'\n") % file);
 
   // find the version of the file requested