summaryrefslogtreecommitdiff
path: root/t/t9101-git-svn-props.sh
diff options
context:
space:
mode:
authorMichael Spang <mspang@uwaterloo.ca>2007-02-12 19:33:37 -0500
committerJunio C Hamano <junkio@cox.net>2007-02-12 22:17:04 -0800
commit7b3fab877d468a51bab6050385ab701697301c62 (patch)
tree888945075844874a43d42197d04c5950d0c94b96 /t/t9101-git-svn-props.sh
parentccf5aa8dd3bc64837a4ca391d0b8bd0e3e481b7e (diff)
downloadgit-7b3fab877d468a51bab6050385ab701697301c62.tar.gz
Work around Subversion race in git-svn tests.
Some of the git-svn tests can fail on fast machines due to a race in Subversion: if a file is modified in the same second it was checked out (or in for that matter), Subversion will not consider it modified. This works around the problem by increasing the timestamp by one second before each commit. [jc: with "touch -r -d" replacement from Eric] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t9101-git-svn-props.sh')
-rwxr-xr-xt/t9101-git-svn-props.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index a2c4dc324a..e8133d81cb 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -56,11 +56,14 @@ test_expect_success 'checkout working copy from svn' "svn co $svnrepo test_wc"
test_expect_success 'setup some commits to svn' \
'cd test_wc &&
echo Greetings >> kw.c &&
+ poke kw.c &&
svn commit -m "Not yet an Id" &&
echo Hello world >> kw.c &&
+ poke kw.c &&
svn commit -m "Modified file, but still not yet an Id" &&
svn propset svn:keywords Id kw.c &&
- svn commit -m "Propset Id"
+ poke kw.c &&
+ svn commit -m "Propset Id" &&
cd ..'
test_expect_success 'initialize git-svn' "git-svn init $svnrepo"
@@ -83,7 +86,7 @@ test_expect_success "propset CR on crlf files" \
svn propset svn:eol-style CR empty &&
svn propset svn:eol-style CR crlf &&
svn propset svn:eol-style CR ne_crlf &&
- svn commit -m "propset CR on crlf files"
+ svn commit -m "propset CR on crlf files" &&
cd ..'
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \