# 
# 
# patch "ChangeLog"
#  from [0b65a7e56ae3b3cc6b524a2d994b7909e11a19b0]
#    to [d263769707ff0a4da4b9d79ad629a3d79c1ca4ff]
# 
# patch "work.cc"
#  from [a2c77eaa2a690c6e1325a39a789f1fe890e1deda]
#    to [6d3bd354fb938e901952cc38599415dbb056e3c8]
# 
============================================================
--- ChangeLog	0b65a7e56ae3b3cc6b524a2d994b7909e11a19b0
+++ ChangeLog	d263769707ff0a4da4b9d79ad629a3d79c1ca4ff
@@ -1,8 +1,14 @@
+2006-12-18  Matt Johnston  <address@hidden>
+
+	* work.cc (get_revision_id): check that the workspace revision
+	exists here (so that codepaths such as "log" will also hit it).
+
 2006-12-16  Joel Rosdahl  <address@hidden>
 
 	* po/sv.po: Corrections of Swedish translation.
 
 2006-12-16  Matt Johnston  <address@hidden>
+
 	* cmd_list.cc: ls_known, ls_changed: sort path output.
 
 2006-12-15  Nathaniel Smith  <address@hidden>
============================================================
--- work.cc	a2c77eaa2a690c6e1325a39a789f1fe890e1deda
+++ work.cc	6d3bd354fb938e901952cc38599415dbb056e3c8
@@ -132,6 +132,8 @@ workspace::get_revision_id(revision_id &
   revision_t rev;
   get_work_rev(rev);
   c = edge_old_revision(rev.edges.begin());
+  N(null_id(c) || db.revision_exists(c),
+    F("workspace base revision %s does not exist in database") % c);
 }
 
 // structures derived from the work revision, the database, and possibly
@@ -145,10 +147,6 @@ workspace::get_base_revision(revision_id
 
   if (!null_id(rid))
     {
-
-      N(db.revision_exists(rid),
-        F("base revision %s does not exist in database") % rid);
-
       db.get_roster(rid, ros, mm);
     }