>From 97e90fcd7cf600726ec468016eb37d1e1de38dde Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Sun, 11 Feb 2007 20:56:22 -0500 Subject: [PATCH] Work around Subversion race in git-svn tests. Signed-off-by: Michael Spang --- t/t9103-git-svn-graft-branches.sh | 1 + t/t9106-git-svn-commit-diff-clobber.sh | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/t/t9103-git-svn-graft-branches.sh b/t/t9103-git-svn-graft-branches.sh index 4e55778..f90f3a8 100755 --- a/t/t9103-git-svn-graft-branches.sh +++ b/t/t9103-git-svn-graft-branches.sh @@ -14,6 +14,7 @@ test_expect_success 'initialize repo' " svn cp -m 'tag a' $svnrepo/trunk $svnrepo/tags/a && svn cp -m 'branch a' $svnrepo/trunk $svnrepo/branches/a && svn co $svnrepo wc && + sleep 1 && cd wc && echo feedme >> branches/a/readme && svn commit -m hungry && diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 59b6425..70c9f58 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -16,6 +16,7 @@ test_expect_success 'initialize repo' " " test_expect_success 'commit change from svn side' " svn co $svnrepo t.svn && + sleep 1 && cd t.svn && echo second line from svn >> file && svn commit -m 'second line from svn' && @@ -43,6 +44,7 @@ test_expect_failure 'dcommit fails to commit because of conflict' " git-svn fetch && git reset --hard refs/remotes/git-svn && svn co $svnrepo t.svn && + sleep 1 && cd t.svn && echo fourth line from svn >> file && svn commit -m 'fourth line from svn' && -- 1.5.0.rc4.gcc46a