Merge branch 'maint'

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index e9832d2bb913d61ce8a92ddf32e009ad59659d53..a33fa8d4c86da54a4d741cf921d1cf7b2138d186 100755 (executable)
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -281,6 +281,11 @@
 # clean up
 unlink(".cvsexportcommit.diff");
 
+# CVS version 1.11.x and 1.12.x sleeps the wrong way to ensure the timestamp
+# used by CVS and the one set by subsequence file modifications are different.
+# If they are not different CVS will not detect changes.
+sleep(1);
+
 sub usage {
        print STDERR <<END;
 Usage: GIT_DIR=/path/to/.git ${\basename $0} [-h] [-p] [-v] [-c] [-f] [-m msgprefix] [ parent ] commit