提交 b3c81cff 编写于 作者: F Frank Lichtenheld 提交者: Junio C Hamano

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: NFrank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 2e4aef58
...@@ -250,6 +250,7 @@ test_expect_success 'cvs update (merge)' \ ...@@ -250,6 +250,7 @@ test_expect_success 'cvs update (merge)' \
git commit -q -m "Merge test (merge)" && git commit -q -m "Merge test (merge)" &&
git push gitcvs.git >/dev/null && git push gitcvs.git >/dev/null &&
cd cvswork && cd cvswork &&
sleep 1 && touch merge &&
GIT_CONFIG="$git_config" cvs -Q update && GIT_CONFIG="$git_config" cvs -Q update &&
diff -q merge ../expected' diff -q merge ../expected'
...@@ -292,6 +293,7 @@ test_expect_success 'cvs update (merge no-op)' \ ...@@ -292,6 +293,7 @@ test_expect_success 'cvs update (merge no-op)' \
git commit -q -m "Merge test (no-op)" && git commit -q -m "Merge test (no-op)" &&
git push gitcvs.git >/dev/null && git push gitcvs.git >/dev/null &&
cd cvswork && cd cvswork &&
sleep 1 && touch merge &&
GIT_CONFIG="$git_config" cvs -Q update && GIT_CONFIG="$git_config" cvs -Q update &&
diff -q merge ../merge' diff -q merge ../merge'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册