# 
# 
# patch "ChangeLog"
#  from [36ddfbc60c098baecae82e3be37bb02055100506]
#    to [706beafb07c4efbfc3de9f118f06f4fb6f4d43f4]
# 
# patch "roster_merge.cc"
#  from [4dec4aecf9c67f0ba369c9430bb492a3d93170bf]
#    to [fb79a4ff1f8320c5a38c8a9f5e162222744451bc]
# 
# patch "unit_tests.cc"
#  from [cd6c9924afd3ab76ba8bfb91ff23990f3a1cc565]
#    to [5f4e6b96f89134edb6d35c799b26932587dc3679]
# 
# patch "unit_tests.hh"
#  from [b2611fdb586f062e99b396dd5985db3b1f884360]
#    to [1f0dbf6a811b8bcb25b0a0071239cf7809867037]
# 
============================================================
--- ChangeLog	36ddfbc60c098baecae82e3be37bb02055100506
+++ ChangeLog	706beafb07c4efbfc3de9f118f06f4fb6f4d43f4
@@ -1,3 +1,11 @@
+2006-02-13  Nathaniel Smith  <address@hidden>
+
+	* roster_merge.cc (is_clean): Simplify.
+	(add_roster_merge_tests): 
+	* unit_tests.cc (init_unit_test_suite): 
+	* unit_tests.hh (add_roster_merge_tests): Add unit test
+	boilerplate.
+
 2006-02-12  Nathaniel Smith  <address@hidden>
 
 	* netsync.cc (serve_connections): Revert garbage that I
============================================================
--- roster_merge.cc	4dec4aecf9c67f0ba369c9430bb492a3d93170bf
+++ roster_merge.cc	fb79a4ff1f8320c5a38c8a9f5e162222744451bc
@@ -14,12 +14,8 @@
 bool
 roster_merge_result::is_clean()
 {
-  return node_name_conflicts.empty()
-    && file_content_conflicts.empty()
-    && node_attr_conflicts.empty()
-    && orphaned_node_conflicts.empty()
-    && rename_target_conflicts.empty()
-    && directory_loop_conflicts.empty();
+  return is_clean_except_for_content()
+    && file_content_conflicts.empty();
 }
 
 bool
@@ -538,3 +534,13 @@
   // FIXME: looped nodes here
 }
 
+#ifdef BUILD_UNIT_TESTS
+#include "unit_tests.hh"
+
+void
+add_roster_merge_tests(test_suite * suite)
+{
+  I(suite);
+}
+
+#endif // BUILD_UNIT_TESTS
============================================================
--- unit_tests.cc	cd6c9924afd3ab76ba8bfb91ff23990f3a1cc565
+++ unit_tests.cc	5f4e6b96f89134edb6d35c799b26932587dc3679
@@ -89,6 +89,9 @@
   if (t.empty() || t.find("roster") != t.end())
     add_roster_tests(suite);  
   
+  if (t.empty() || t.find("roster_merge") != t.end())
+    add_roster_merge_tests(suite);
+
   // all done, add our clean-shutdown-indicator
   suite->add(BOOST_TEST_CASE(&clean_shutdown_dummy_test));
 
============================================================
--- unit_tests.hh	b2611fdb586f062e99b396dd5985db3b1f884360
+++ unit_tests.hh	1f0dbf6a811b8bcb25b0a0071239cf7809867037
@@ -36,5 +36,6 @@
 void add_string_queue_tests(test_suite * suite);
 void add_paths_tests(test_suite * suite);
 void add_roster_tests(test_suite * suite);
+void add_roster_merge_tests(test_suite * suite);
 
 #endif