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/t9106-git-svn-commit-diff-clobber.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/t9106-git-svn-commit-diff-clobber.sh')
| -rwxr-xr-x | t/t9106-git-svn-commit-diff-clobber.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 59b6425ce..6f132f241 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -18,6 +18,7 @@ test_expect_success 'commit change from svn side' " svn co $svnrepo t.svn && cd t.svn && echo second line from svn >> file && + poke file && svn commit -m 'second line from svn' && cd .. && rm -rf t.svn @@ -45,6 +46,7 @@ test_expect_failure 'dcommit fails to commit because of conflict' " svn co $svnrepo t.svn && cd t.svn && echo fourth line from svn >> file && + poke file && svn commit -m 'fourth line from svn' && cd .. && rm -rf t.svn && |