# 
# 
# patch "ChangeLog"
#  from [6d0876defc752f25268b2c561b8fbd27a10b9233]
#    to [3fee00574e04881c0c4abfdb9c0f060115b1dad9]
# 
# patch "cmd_ws_commit.cc"
#  from [cfa8ee108b983fc36c03e6676ad9c3db76cead1b]
#    to [c56207670338416cc0756f1f9a37c7ac60d6297f]
# 
============================================================
--- ChangeLog	6d0876defc752f25268b2c561b8fbd27a10b9233
+++ ChangeLog	3fee00574e04881c0c4abfdb9c0f060115b1dad9
@@ -1,5 +1,8 @@ 2007-02-09  Zack Weinberg  <address@hidden
 2007-02-09  Zack Weinberg  <address@hidden>
 
+	* cmd_ws_commit.cc (revert): Remove the remaining use of
+	get_revision_id.
+
 	* cmd_files.cc (cat, automate get_file_of): Fail gracefully in a
 	two-parent workspace, unless given -r.
 	* tests/two_parent_workspace_commands_that_fail: Test them.
============================================================
--- cmd_ws_commit.cc	cfa8ee108b983fc36c03e6676ad9c3db76cead1b
+++ cmd_ws_commit.cc	c56207670338416cc0756f1f9a37c7ac60d6297f
@@ -88,13 +88,13 @@ CMD(revert, N_("workspace"), N_("[PATH].
 
   app.require_workspace();
 
-  {
-    parent_map parents;
-    app.work.get_parent_rosters(parents);
-    N(parents.size() == 1,
-      F("this command can only be used in a single-parent workspace"));
-    old_roster = *(parents.begin()->second.first);
+  parent_map parents;
+  app.work.get_parent_rosters(parents);
+  N(parents.size() == 1,
+    F("this command can only be used in a single-parent workspace"));
+  old_roster = parent_roster(parents.begin());
 
+  {
     temp_node_id_source nis;
     app.work.get_current_roster_shape(new_roster, nis);
   }
@@ -198,9 +198,7 @@ CMD(revert, N_("workspace"), N_("[PATH].
   // around.
 
   revision_t remaining;
-  revision_id base;
-  app.work.get_revision_id(base);
-  make_revision_for_workspace(base, excluded, remaining);
+  make_revision_for_workspace(parent_id(parents.begin()), excluded, remaining);
 
   // Race.
   app.work.put_work_rev(remaining);