diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-29 16:43:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-29 16:43:23 -0700 |
| commit | 6b4790db2432c0bc45586245fecaf04581499f73 (patch) | |
| tree | 61e5b4bb6d4dae81cefb51387ec0ea895f618718 /t | |
| parent | 2a350d7a68f27790e563eaa9fbca16cca191ea40 (diff) | |
| parent | ffab62681cf420abb87aabf3fd2fc96e000877e4 (diff) | |
| download | git-6b4790db2432c0bc45586245fecaf04581499f73.tar.gz git-6b4790db2432c0bc45586245fecaf04581499f73.tar.xz | |
Merge branch 'sv/svn'
* sv/svn:
git-svn: handle changed svn command-line syntax
git-svn: fix test for trunk svn (transaction out of date)
git-svn: fix test for trunk svn (commit message not needed)
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9101-git-svn-props.sh | 1 | ||||
| -rwxr-xr-x | t/t9104-git-svn-follow-parent.sh | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index 622ea1c0d..5aac64422 100755 --- a/t/t9101-git-svn-props.sh +++ b/t/t9101-git-svn-props.sh @@ -140,6 +140,7 @@ test_expect_success 'test show-ignore' " cd test_wc && mkdir -p deeply/nested/directory && svn add deeply && + svn up && svn propset -R svn:ignore 'no-such-file*' . svn commit -m 'propset svn:ignore' cd .. && diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index d8f9cab35..7ba76309a 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -19,8 +19,7 @@ test_expect_success 'initialize repo' " poke trunk/readme && svn commit -m 'another commit' && svn up && - svn mv -m 'rename to thunk' trunk thunk && - svn up && + svn mv trunk thunk && echo goodbye >> thunk/readme && poke thunk/readme && svn commit -m 'bye now' && @@ -52,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' " " test_expect_success 'follow deleted parent' " - svn cp -m 'resurrecting trunk as junk' \ - -r2 $svnrepo/trunk $svnrepo/junk && + (svn cp -m 'resurrecting trunk as junk' \ + $svnrepo/trunk@2 $svnrepo/junk || + svn cp -m 'resurrecting trunk as junk' \ + -r2 $svnrepo/trunk $svnrepo/junk) && git config --add svn-remote.svn.fetch \ junk:refs/remotes/svn/junk && git-svn fetch -i svn/thunk && |