diff options
| author | Michael Spang <mspang@uwaterloo.ca> | 2007-02-12 19:33:37 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 22:17:04 -0800 |
| commit | 7b3fab877d468a51bab6050385ab701697301c62 (patch) | |
| tree | 888945075844874a43d42197d04c5950d0c94b96 /t/t9104-git-svn-follow-parent.sh | |
| parent | ccf5aa8dd3bc64837a4ca391d0b8bd0e3e481b7e (diff) | |
| download | git-7b3fab877d468a51bab6050385ab701697301c62.tar.gz git-7b3fab877d468a51bab6050385ab701697301c62.tar.xz | |
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/t9104-git-svn-follow-parent.sh')
| -rwxr-xr-x | t/t9104-git-svn-follow-parent.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 8d2e2fec3..405b55536 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -16,11 +16,13 @@ test_expect_success 'initialize repo' " svn co $svnrepo wc && cd wc && echo world >> trunk/readme && + poke trunk/readme && svn commit -m 'another commit' && svn up && svn mv -m 'rename to thunk' trunk thunk && svn up && echo goodbye >> thunk/readme && + poke thunk/readme && svn commit -m 'bye now' && cd .. " |