Skip to content

Commit

Permalink
t9400: Work around CVS' deficiencies
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Frank Lichtenheld authored and Junio C Hamano committed May 29, 2007
1 parent 2e4aef5 commit b3c81cf
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions t/t9400-git-cvsserver-server.sh
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit b3c81cf

Please sign in to comment.