#
#
# patch "rcs_import.cc"
#  from [86c220cc7b69e06123ba3db1b8745f694173adb6]
#    to [621826bd4e3181f3670ed75866e93b5237815ee2]
#
============================================================
--- rcs_import.cc	86c220cc7b69e06123ba3db1b8745f694173adb6
+++ rcs_import.cc	621826bd4e3181f3670ed75866e93b5237815ee2
@@ -980,10 +980,8 @@ import_rcs_file_with_cvs(string const & 
 
     cvs.set_filename (filename, fid);
     cvs.index_branchpoint_symbols (r);
-    // FIXME: hmm.. does put_file check, now? Or has the file_version_exists()
-    //        simply not been ported, yet?
-    // if (! db.file_version_exists (fid) && !app.opts.dryrun)
-    db.put_file(fid, file_data(dat));
+    if (!app.opts.dryrun)
+      app.db.put_file(fid, file_data(dat));
 
     global_pieces.reset();
     global_pieces.index_deltatext(r.deltatexts.find(r.admin.head)->second,
@@ -1893,21 +1891,15 @@ blob_consumer::store_revisions()
 void
 blob_consumer::store_revisions()
 {
-  for (vector<prepared_revision>::const_iterator i = preps.begin();
-       i != preps.end(); ++i)
-    //FIXME: orientation
-    if (! app.opts.dryrun)
-      {
-    //FIXME: put_revision returns false if the revision already exists?
-    //       or does it err out (which would be wrong)?
-    if (app.db.put_revision(i->rid, *(i->rev)))
-      {
-        store_auxiliary_certs(*i);
-        ++n_revisions;
-      }
-      }
+  if (! app.opts.dryrun)
+    for (vector<prepared_revision>::const_iterator i = preps.begin();
+         i != preps.end(); ++i)
+      if (app.db.put_revision(i->rid, *(i->rev)))
+        {
+          store_auxiliary_certs(*i);
+          ++n_revisions;
+        }
 }
-}
 
 void
 blob_consumer::store_auxiliary_certs(prepared_revision const & p)
@@ -1915,7 +1907,6 @@ blob_consumer::store_auxiliary_certs(pre
   string author, changelog;
 
   cvs.split_authorclog(p.authorclog, author, changelog);
-  packet_db_writer dbw(app);
   string bn = cvs.get_branchname(p.branchname);
   app.get_project().put_standard_certs(p.rid,
                                        branch_name(bn),