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

git-svn: --follow-parent works with svn-remotes multiple branches

Browse Source 
Bugs fixed:

 * We didn't allow manually (not using git-svn) init-ed
   remotes/fetch refspecs to be used before.  It works now
   because that's what I did in this test.  git-svn init should
   offer more control in the future.
 * correctly strip paths in the delta editor when using
   do_switch().
 * Make the -i / GIT_SVN_ID option work correctly when doing
   fetch on a multi-ref svn-remote

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2007-01-22 11:44:57 -08:00
parent 15710b6f34
commit 8b8fc06824
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,19 @@ test_expect_success 'init and fetch --follow-parent a moved directory' "
sed -n -e '3p'\`\" = goodbye
"
test_expect_success 'init and fetch from one svn-remote' "
git-repo-config svn-remote.git-svn.url $svnrepo &&
git-repo-config --add svn-remote.git-svn.fetch \
trunk:refs/remotes/svn/trunk &&
git-repo-config --add svn-remote.git-svn.fetch \
thunk:refs/remotes/svn/thunk &&
git-svn fetch --follow-parent -i svn/thunk &&
test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
= \"\`git-rev-parse --verify refs/remotes/svn/thunk~1\`\" &&
test \"\`git-cat-file blob refs/remotes/svn/thunk:readme |\
sed -n -e '3p'\`\" = goodbye
"
test_debug 'gitk --all &'
test_done