# 
# patch "ChangeLog"
#  from [5f22b15b8800a0c76f3b0e4b26ecda1cb7f654ca]
#    to [eb2d404a8e3966af23ba92e0f8c0954328fe1d44]
# 
# patch "change_set.cc"
#  from [bd5f0a03f8512b1319cb9c2323a3aa81f8d67b1c]
#    to [68528aabba353eadead5e05ca0e2cc30dddd005d]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,10 @@
 2005-04-26  Matt Johnston  <address@hidden>
 
+	* change_set.cc (analyze_rearrangement): get rid of damaged_in_first
+	since it is not used.
+
+2005-04-26  Matt Johnston  <address@hidden>
+
 	* monotone.texi: fix mashed up merge of docs for kill_rev_locally
 	and db check.
 
--- change_set.cc
+++ change_set.cc
@@ -1102,7 +1102,7 @@
 {
   directory_map first_map, second_map;
   state_renumbering renumbering;
-  std::set<tid> damaged_in_first, damaged_in_second;
+  std::set<tid> damaged_in_second;
 
   pa.first.clear();
   pa.second.clear();
@@ -1112,7 +1112,6 @@
     {
       tid x = ensure_file_in_map(*f, first_map, pa.first, ts);
       pa.second.insert(std::make_pair(x, path_item(root_tid, ptype_file, make_null_component())));
-      damaged_in_first.insert(x);
     }
 
   for (std::set<file_path>::const_iterator d = pr.deleted_dirs.begin();
@@ -1120,7 +1119,6 @@
     {
       tid x = ensure_dir_in_map(*d, first_map, pa.first, ts);
       pa.second.insert(std::make_pair(x, path_item(root_tid, ptype_directory, make_null_component())));
-      damaged_in_first.insert(x);
     }
 
   for (std::map<file_path,file_path>::const_iterator rf = pr.renamed_files.begin();
@@ -1130,7 +1128,6 @@
       tid b = ensure_file_in_map(rf->second, second_map, pa.second, ts);
       I(renumbering.find(a) == renumbering.end());
       renumbering.insert(std::make_pair(b,a));
-      damaged_in_first.insert(a);
       damaged_in_second.insert(b);
     }
 
@@ -1141,7 +1138,6 @@
       tid b = ensure_dir_in_map(rd->second, second_map, pa.second, ts);
       I(renumbering.find(a) == renumbering.end());
       renumbering.insert(std::make_pair(b,a));
-      damaged_in_first.insert(a);
       damaged_in_second.insert(b);
     }