# 
# 
# patch "ChangeLog"
#  from [a88f5847f8b8bbf7efbb4fcae34ca64d27e742b9]
#    to [5396127abd1a71e60a2953b34f05863662bcbd26]
# 
# patch "automate.cc"
#  from [16440dd895efd92ee9e667a8c0d90cd87b4bfd57]
#    to [f2931d09eb4d83530f6f67931d8878869ef70d25]
# 
============================================================
--- ChangeLog	a88f5847f8b8bbf7efbb4fcae34ca64d27e742b9
+++ ChangeLog	5396127abd1a71e60a2953b34f05863662bcbd26
@@ -1,3 +1,7 @@
+2006-10-23  Thomas Keller <address@hidden>
+
+    Make test case pass, code cleanup.
+
 2006-10-20  Thomas Keller <address@hidden>
 
     Docs added for automate content_diff
============================================================
--- automate.cc	16440dd895efd92ee9e667a8c0d90cd87b4bfd57
+++ automate.cc	f2931d09eb4d83530f6f67931d8878869ef70d25
@@ -1661,7 +1661,6 @@ AUTOMATE(content_diff, N_("[FILE [...] [
   
   //
   // What follows is pretty much copied from cmd_diff_log.cc:CMD(diff,...)
-  // with some slight adaptions noted with separate FIXMEs
   // TODO: someone with a better overview should probably factor this 
   // out somewhere
   //
@@ -1673,7 +1672,6 @@ AUTOMATE(content_diff, N_("[FILE [...] [
       app.work.get_base_and_current_roster_shape(old_roster, new_roster, nis);
       app.work.get_revision_id(old_rid);
 
-      //node_restriction mask(args_to_paths(args),
       node_restriction mask(args_to_paths(other_args),
                             args_to_paths(app.exclude_patterns),
                             app.depth,
@@ -1694,10 +1692,6 @@ AUTOMATE(content_diff, N_("[FILE [...] [
       // Clobber old_roster with the one specified
       app.db.get_roster(rev_ids.at(0), old_roster);
 
-      // FIXME: handle no ancestor case
-      // N(r_new.edges.size() == 1, F("current revision has no ancestor"));
-
-      //node_restriction mask(args_to_paths(args),
       node_restriction mask(args_to_paths(other_args),
                             args_to_paths(app.exclude_patterns), 
                             app.depth,