# 
# 
# patch "ChangeLog"
#  from [5af829631409e7c534fb0ac9f8e63d809131d3cc]
#    to [e02c58404ced0a430ed9ad74d4790635e0d5f170]
# 
# patch "cmd_diff_log.cc"
#  from [5b89fe46b77f87f89cb871fb96170dd8a5352fd4]
#    to [304f573d7fe7c8036273902966eee48c3698a73c]
# 
============================================================
--- ChangeLog	5af829631409e7c534fb0ac9f8e63d809131d3cc
+++ ChangeLog	e02c58404ced0a430ed9ad74d4790635e0d5f170
@@ -1,5 +1,9 @@
 2006-07-07  Nathaniel Smith  <address@hidden>
 
+	* cmd_diff_log.cc: Remove tabs.
+
+2006-07-07  Nathaniel Smith  <address@hidden>
+
 	* lcs.cc (_longest_common_subsequence): Trivial whitespace tweak.
 
 2006-07-07  Nathaniel Smith  <address@hidden>
============================================================
--- cmd_diff_log.cc	5b89fe46b77f87f89cb871fb96170dd8a5352fd4
+++ cmd_diff_log.cc	304f573d7fe7c8036273902966eee48c3698a73c
@@ -123,14 +123,14 @@
            i = cs.nodes_renamed.begin();
            i != cs.nodes_renamed.end(); i++)
         os << "        " << file_path(i->first) 
-	   << " to " << file_path(i->second) << "\n";
+           << " to " << file_path(i->second) << "\n";
     }
 
   if (! cs.files_added.empty())
     {
       path_set tmp;
       for (map<split_path, file_id>::const_iterator 
-	     i = cs.files_added.begin();
+             i = cs.files_added.begin();
            i != cs.files_added.end(); ++i)
         tmp.insert(i->first);
       os << "Added files:" << "\n";
@@ -147,7 +147,7 @@
     {
       path_set tmp;
       for (map<split_path, pair<file_id, file_id> >::const_iterator 
-	     i = cs.deltas_applied.begin();
+             i = cs.deltas_applied.begin();
            i != cs.deltas_applied.end(); ++i)
         tmp.insert(i->first);
       os << "Modified files:" << "\n";
@@ -158,12 +158,12 @@
     {
       path_set tmp;
       for (set<pair<split_path, attr_key> >::const_iterator 
-	     i = cs.attrs_cleared.begin();
+             i = cs.attrs_cleared.begin();
            i != cs.attrs_cleared.end(); ++i)
         tmp.insert(i->first);
 
       for (map<pair<split_path, attr_key>, attr_value>::const_iterator 
-	     i = cs.attrs_set.begin();
+             i = cs.attrs_set.begin();
            i != cs.attrs_set.end(); ++i)
         tmp.insert(i->first.first);
 
@@ -309,8 +309,8 @@
       if (guess_binary(data_new()) ||
           guess_binary(data_old()))
         cout << "# " 
-	     << file_path(delta_entry_path(i)) 
-	     << " is binary\n";
+             << file_path(delta_entry_path(i)) 
+             << " is binary\n";
       else
         {
           split_into_lines(data_old(), old_lines);
@@ -380,7 +380,7 @@
       revision_id old_rid;
 
       get_base_and_current_roster_shape(old_roster, new_roster, 
-					nis, app);
+                                        nis, app);
       get_revision_id(old_rid);
 
       node_restriction mask(args, app.exclude_patterns, 
@@ -388,7 +388,7 @@
 
       update_current_roster_from_filesystem(new_roster, mask, app);
       make_restricted_csets(old_roster, new_roster, 
-			    included, excluded, mask);
+                            included, excluded, mask);
       check_restricted_cset(old_roster, included);
 
       new_is_archived = false;
@@ -404,8 +404,8 @@
         F("no such revision '%s'") % r_old_id);
 
       get_base_and_current_roster_shape(old_roster, 
-					new_roster, 
-					nis, app);
+                                        new_roster, 
+                                        nis, app);
       // Clobber old_roster with the one specified
       app.db.get_roster(r_old_id, old_roster);
 
@@ -417,7 +417,7 @@
 
       update_current_roster_from_filesystem(new_roster, mask, app);
       make_restricted_csets(old_roster, new_roster, 
-			    included, excluded, mask);
+                            included, excluded, mask);
       check_restricted_cset(old_roster, included);
 
       new_is_archived = false;
@@ -465,7 +465,7 @@
       //   since versioned paths are required to be relative.
 
       make_restricted_csets(old_roster, new_roster, 
-			    included, excluded, mask);
+                            included, excluded, mask);
       check_restricted_cset(old_roster, included);
 
       new_is_archived = true;
@@ -486,7 +486,7 @@
     {
       cout << header.str() << "# " << "\n";
       for (vector<string>::iterator i = lines.begin(); 
-	   i != lines.end(); ++i)
+           i != lines.end(); ++i)
         cout << "# " << *i << "\n";
     }
   else
@@ -544,7 +544,7 @@
 
 static void
 log_certs(app_state & app, revision_id id, cert_name name, 
-	  string label, bool multiline)
+          string label, bool multiline)
 {
   log_certs(app, id, name, label, label, multiline, true);
 }
@@ -596,7 +596,7 @@
 
       if (app.revision_selectors.size() == 0)
         get_base_and_current_roster_shape(old_roster, 
-					  new_roster, nis, app);
+                                          new_roster, nis, app);
       else
         app.db.get_roster(first_rid, new_roster);
 
@@ -623,7 +623,7 @@
   revision_set rev;
 
   while(! frontier.empty() && (last == -1 || last > 0) 
-	&& (next == -1 || next > 0))
+        && (next == -1 || next > 0))
     {
       set<revision_id> next_frontier;
 
@@ -722,7 +722,7 @@
                   }
 
                 for (set<revision_id>::const_iterator 
-		       anc = ancestors.begin();
+                       anc = ancestors.begin();
                      anc != ancestors.end(); ++anc)
                   cout << "Ancestor: " << *anc << "\n";