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

Merge branch 'sv/svn'

Browse Source 
* 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)
This commit is contained in:
Junio C Hamano
2007-09-29 16:43:23 -07:00
parent 2a350d7a68 ffab62681c
commit 6b4790db24
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
t/t9101-git-svn-props.sh
View File

@ -140,6 +140,7 @@ test_expect_success 'test show-ignore' "
cd test_wc && cd test_wc &&
mkdir -p deeply/nested/directory && mkdir -p deeply/nested/directory &&
svn add deeply && svn add deeply &&
svn up &&
svn propset -R svn:ignore 'no-such-file*' . svn propset -R svn:ignore 'no-such-file*' .
svn commit -m 'propset svn:ignore' svn commit -m 'propset svn:ignore'
cd .. && cd .. &&

9
t/t9104-git-svn-follow-parent.sh
View File

@ -19,8 +19,7 @@ test_expect_success 'initialize repo' "
poke trunk/readme && poke trunk/readme &&
svn commit -m 'another commit' && svn commit -m 'another commit' &&
svn up && svn up &&
svn mv -m 'rename to thunk' trunk thunk && svn mv trunk thunk &&
svn up &&
echo goodbye >> thunk/readme && echo goodbye >> thunk/readme &&
poke thunk/readme && poke thunk/readme &&
svn commit -m 'bye now' && 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' " test_expect_success 'follow deleted parent' "
svn cp -m 'resurrecting trunk as junk' \ (svn cp -m 'resurrecting trunk as junk' \
-r2 $svnrepo/trunk $svnrepo/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 \ git config --add svn-remote.svn.fetch \
junk:refs/remotes/svn/junk && junk:refs/remotes/svn/junk &&
git-svn fetch -i svn/thunk && git-svn fetch -i svn/thunk &&