#
#
# patch "rcs_import.cc"
#  from [93c0454b23e1c0e4cf43752da1ac6f3bc610e28d]
#    to [f59e4a3d794ba1be64bf658d6a7f111330e06506]
#
============================================================
--- rcs_import.cc	93c0454b23e1c0e4cf43752da1ac6f3bc610e28d
+++ rcs_import.cc	f59e4a3d794ba1be64bf658d6a7f111330e06506
@@ -1848,7 +1848,9 @@ public:
       {
         try
           {
+            transaction_guard guard(app.db);
             import_rcs_file_with_cvs(file, app, cvs);
+            guard.commit();
           }
         catch (oops const & o)
           {
@@ -3536,7 +3538,6 @@ import_cvs_repo(system_path const & cvsr
   // of all files we know. This already creates file deltas and
   // hashes. We end up with a DAG of blobs.
   {
-    transaction_guard guard(app.db);
     cvs_tree_walker walker(cvs, app);
     require_path_is_directory(cvsroot,
                               F("path %s does not exist") % cvsroot,
@@ -3544,7 +3545,6 @@ import_cvs_repo(system_path const & cvsr
     app.db.ensure_open();
     change_current_working_dir(cvsroot);
     walk_tree(file_path(), walker);
-    guard.commit();
   }
 
   // then we use algorithms from graph theory to get the blobs into