diff options
Diffstat (limited to 't/t9101-git-svn-props.sh')
| -rwxr-xr-x | t/t9101-git-svn-props.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index a5a235f100..e8133d81cb 100755 --- a/t/t9101-git-svn-props.sh +++ b/t/t9101-git-svn-props.sh @@ -56,14 +56,14 @@ test_expect_success 'checkout working copy from svn' "svn co $svnrepo test_wc" test_expect_success 'setup some commits to svn' \ 'cd test_wc && echo Greetings >> kw.c && + poke kw.c && svn commit -m "Not yet an Id" && - svn up && echo Hello world >> kw.c && + poke kw.c && svn commit -m "Modified file, but still not yet an Id" && - svn up && svn propset svn:keywords Id kw.c && + poke kw.c && svn commit -m "Propset Id" && - svn up && cd ..' test_expect_success 'initialize git-svn' "git-svn init $svnrepo" @@ -73,8 +73,8 @@ name='test svn:keywords ignoring' test_expect_success "$name" \ 'git checkout -b mybranch remotes/git-svn && echo Hi again >> kw.c && - git commit -a -m "test keywoards ignoring" && - git-svn commit remotes/git-svn..mybranch && + git commit -a -m "test keywords ignoring" && + git-svn set-tree remotes/git-svn..mybranch && git pull . remotes/git-svn' expect='/* $Id$ */' @@ -87,7 +87,6 @@ test_expect_success "propset CR on crlf files" \ svn propset svn:eol-style CR crlf && svn propset svn:eol-style CR ne_crlf && svn commit -m "propset CR on crlf files" && - svn up && cd ..' test_expect_success 'fetch and pull latest from svn and checkout a new wc' \ @@ -111,8 +110,7 @@ cd test_wc svn propset svn:eol-style CRLF ne_cr && svn propset svn:keywords Id cr && svn propset svn:keywords Id ne_cr && - svn commit -m "propset CRLF on cr files" && - svn up' + svn commit -m "propset CRLF on cr files"' cd .. test_expect_success 'fetch and pull latest from svn' \ 'git-svn fetch && git pull . remotes/git-svn' |