X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9106-git-svn-commit-diff-clobber.sh;h=6f132f2419462c20748b1a6fcb2df36a53ab0f89;hb=0220f1ebdee113e02031de0dba2d5e2c8623d6bb;hp=58698b3f29966593d1f7063b04e8d07322636572;hpb=45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff;p=git.git diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 58698b3f2..6f132f241 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -4,13 +4,6 @@ test_description='git-svn commit-diff clobber' . ./lib-git-svn.sh -if test -n "$GIT_SVN_NO_LIB" && test "$GIT_SVN_NO_LIB" -ne 0 -then - echo 'Skipping: commit-diff clobber needs SVN libraries' - test_done - exit 0 -fi - test_expect_success 'initialize repo' " mkdir import && cd import && @@ -25,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 @@ -52,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 &&