From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Tue, 24 Jul 2007 22:56:20 +0000 (+0200)
Subject: cvsexportcommit: avoid racy CVS problem.
X-Git-Tag: v1.5.3-rc3~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f836f1ae9b1535d6a1aeb4a0e8a33d65edaf9ff8;p=git.git

cvsexportcommit: avoid racy CVS problem.

If git cvsexportcommit is executed fast enough in sequence, the CVS
timestamps could end up being the same. CVS tries to fix this
by sleeping until the CPU clock changes seconds. Unfortunately,
the CPU clock and the file system clock are not necessarily the same, so
the timestamps could be the same anyway. When that happens CVS may not
recognize changed files and cvs will forget to commit some files.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index e9832d2bb..a33fa8d4c 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -281,6 +281,11 @@ if ($opt_c) {
 # 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