# 
# patch "ChangeLog"
#  from [e46e02d3812c141fed6341abd10ce0a48ab3598f]
#    to [5a068aff30e9e4f51bcae6afed6a46825ae1d342]
# 
# patch "commands.cc"
#  from [2546adbbe28ab041dcdbfeaf41afb0d5897e882c]
#    to [070e8916520a3fac640ca73ad770f848fc1e4c39]
# 
========================================================================
--- ChangeLog	e46e02d3812c141fed6341abd10ce0a48ab3598f
+++ ChangeLog	5a068aff30e9e4f51bcae6afed6a46825ae1d342
@@ -1,5 +1,8 @@
 2005-08-19  Matthew Gregan  <address@hidden>
 
+	* commands.cc (CMD(diff)): Include base revision ID in diff output
+	header when diffing against working copy.  Useful to identify what
+	revision a patch was created against.
 	* std_hooks.lua (ignore_file): Ignore Visual SourceSafe junk.
 
 2005-08-18  Timothy Brownawell  <address@hidden>
========================================================================
--- commands.cc	2546adbbe28ab041dcdbfeaf41afb0d5897e882c
+++ commands.cc	070e8916520a3fac640ca73ad770f848fc1e4c39
@@ -2583,6 +2583,7 @@
   manifest_map m_new;
   bool new_is_archived;
   diff_type type = app.diff_format;
+  ostringstream header;
 
   change_set composite;
 
@@ -2601,6 +2602,9 @@
       if (r_new.edges.size() == 1)
         composite = edge_changes(r_new.edges.begin());
       new_is_archived = false;
+      revision_id old_rid;
+      get_revision_id(old_rid);
+      header << "# old_revision [" << old_rid << "]" << endl;
     }
   else if (app.revision_selectors.size() == 1)
     {
@@ -2614,26 +2618,22 @@
       I(r_new.edges.size() == 1 || r_new.edges.size() == 0);
       N(r_new.edges.size() == 1, F("current revision has no ancestor"));
       new_is_archived = false;
+      header << "# old_revision [" << r_old_id << "]" << endl;
     }
   else if (app.revision_selectors.size() == 2)
     {
       revision_id r_old_id, r_new_id;
       manifest_id m_new_id;
-
       complete(app, idx(app.revision_selectors, 0)(), r_old_id);
       complete(app, idx(app.revision_selectors, 1)(), r_new_id);
-
       N(app.db.revision_exists(r_old_id),
         F("revision %s does not exist") % r_old_id);
       app.db.get_revision(r_old_id, r_old);
-
       N(app.db.revision_exists(r_new_id),
         F("revision %s does not exist") % r_new_id);
       app.db.get_revision(r_new_id, r_new);
-
       app.db.get_revision_manifest(r_new_id, m_new_id);
       app.db.get_manifest(m_new_id, m_new);
-
       new_is_archived = true;
     }
   else
@@ -2682,6 +2682,7 @@
   cout << "# " << endl;
   if (summary().size() > 0) 
     {
+      cout << header.str() << "# " << endl;
       for (vector<string>::iterator i = lines.begin(); i != lines.end(); ++i)
         cout << "# " << *i << endl;
     }