# 
# 
# patch "rcs_import.cc"
#  from [a163f21bd252c565a25bfe9ec7ec54b095cba55a]
#    to [b49e39fff32bb49e7404a914dfa268d65693017a]
# 
# patch "tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua"
#  from [a9bbce79a2f24f68156023636326bc1825b78146]
#    to [3e662c5557781b3bd822af002f10e4f16c3ca798]
# 
============================================================
--- rcs_import.cc	a163f21bd252c565a25bfe9ec7ec54b095cba55a
+++ rcs_import.cc	b49e39fff32bb49e7404a914dfa268d65693017a
@@ -98,7 +98,6 @@ cvs_event
 
   bool is_synthetic_branch_root;
   time_t time;
-  time_t resynced_time;
   bool alive;
   cvs_author author;
   cvs_changelog changelog;
@@ -310,7 +309,6 @@ cvs_event::cvs_event(rcs_file const & r,
 #endif
   time = mktime(&t);
   L(FL("= %i") % time);
-  resynced_time = time;
 
   is_synthetic_branch_root = is_sbr(delta->second,
                                     deltatext->second);
@@ -636,7 +634,6 @@ process_branch(string const & begin_vers
                database & db,
                cvs_history & cvs)
 {
-  time_t last_commit_time = 0;
   string curr_version = begin_version;
   scoped_ptr< vector< piece > > next_lines(new vector<piece>);
   scoped_ptr< vector< piece > > curr_lines(new vector<piece>
@@ -668,25 +665,6 @@ process_branch(string const & begin_vers
 
           insert_into_db(curr_data, curr_id,
                          *next_lines, next_data, next_id, db);
-
-          /*
-           * resync: check if curr_commit timestamp really is _before_ the
-           * last_commit one. Otherwise, we assign a new resync time. Such
-           * things can (but should not often) happen in CVS due to a clock
-           * skew or such.
-           *
-           * Remember that process_branch goes downwards, i.e. from 1.6 to
-           * 1.5 to 1.4, etc...
-           *
-           * Also note that the resynced_time is mainly used to sort
-           * correctly within one file.
-           */
-          if ((last_commit_time) && (curr_commit.time >= last_commit_time))
-            {
-              curr_commit.resynced_time = last_commit_time - 2;
-              L(FL("resyncing time by %d seconds.") %
-                (curr_commit.time - curr_commit.resynced_time));
-            }
         }
 
       // mark the beginning-of-branch time and state of this file if
@@ -781,7 +759,6 @@ process_branch(string const & begin_vers
           curr_version = next_version;
           swap(next_lines, curr_lines);
           next_lines->clear();
-          last_commit_time = curr_commit.resynced_time;
         }
       else break;
     }
============================================================
--- tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	a9bbce79a2f24f68156023636326bc1825b78146
+++ tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	3e662c5557781b3bd822af002f10e4f16c3ca798
@@ -46,7 +46,7 @@ check(indir("testsrc", cvs ("commit", "-
 
 -- import into monotone and check presence of files
 
-check(mtn("--branch=test", "cvs_import", cvsroot.."/testsrc"), 0, false, false)
+check(mtn("--branch=test", "--debug", "--verbose", "cvs_import", cvsroot.."/testsrc"), 0, false, false)
 
 -- also check that checkout is correct
 -- right one.