mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around Subversion race in git-svn tests.

Browse Source 
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>
This commit is contained in:
Michael Spang
2007-02-12 19:33:37 -05:00
committed by Junio C Hamano
parent ccf5aa8dd3
commit 7b3fab877d
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t9106-git-svn-commit-diff-clobber.sh
View File

@ -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 &&