# 
# patch "ChangeLog"
#  from [6ab149c913c59e94e735adec219304d5a0b1d4a3]
#    to [6a7d34cbf274bd4e408508887ff73b2c7abfb222]
# 
# patch "change_set.cc"
#  from [8b733d5b674155d95c2c8dda60fa99b18acf9c11]
#    to [f680797285e20aa2ff83233d95e7d2ac111443bb]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-04-17  Matt Johnston  <address@hidden>
+
+	* change_set.cc (confirm_proper_tree): remove incorrect code
+	setting confirmed nodes.
+
 2005-04-18  Nathaniel Smith  <address@hidden>
 
 	* monotone.texi (Dealing with a Fork): Clarify (hopefully) what we
--- change_set.cc
+++ change_set.cc
@@ -539,7 +539,6 @@
           sanity_check_path_item(item);
           I(ancs.find(curr) == ancs.end());
           ancs.insert(curr);
-          confirmed.set(curr - min_tid);
           if (path_item_parent(item) == root_tid)
             break;
           else