summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-05-27 12:33:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-29 07:27:21 (GMT)
commitb3c81cff02e56a62bd657148da757fdfd8dc6255 (patch)
tree354eb08802d08748c0e1a66fa3c17686b4d0350a
parent2e4aef58932cdb345893103d77823a9dd6a146a6 (diff)
downloadgit-b3c81cff02e56a62bd657148da757fdfd8dc6255.zip
git-b3c81cff02e56a62bd657148da757fdfd8dc6255.tar.gz
git-b3c81cff02e56a62bd657148da757fdfd8dc6255.tar.bz2
t9400: Work around CVS' deficiencies
If we are too fast with our changes, the file in the working copy might still have the same mtime as noted in the CVS/Entries. This will cause CVS to happily report to the server that the file is unmodified which can lead to data loss (and in our case test failure). CVS sucks! Work around that by sleeping for a second. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xt/t9400-git-cvsserver-server.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 7f9c6e2..76a9b1a 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -250,6 +250,7 @@ test_expect_success 'cvs update (merge)' \
git commit -q -m "Merge test (merge)" &&
git push gitcvs.git >/dev/null &&
cd cvswork &&
+ sleep 1 && touch merge &&
GIT_CONFIG="$git_config" cvs -Q update &&
diff -q merge ../expected'
@@ -292,6 +293,7 @@ test_expect_success 'cvs update (merge no-op)' \
git commit -q -m "Merge test (no-op)" &&
git push gitcvs.git >/dev/null &&
cd cvswork &&
+ sleep 1 && touch merge &&
GIT_CONFIG="$git_config" cvs -Q update &&
diff -q merge ../merge'