git - svn checkout fail due to a folder named .svn in my tree -

my question similar different one: tortoisesvn error : same name administrative directory

i use git-svn client , had test data contains fake .svn folder in data tree. got dcommitt'ed svn. when try checkout fresh working copy using svn co, got error:

svn: e155000: failed add directory '/myrepo/testdata/root/.svn': object of same name administrative directory 

i've tried delete folder , dcommitt'ed again. didn't help.

update

i figured out.

i on feature branch removed .svn folder (only 1 file under) using:

git rm /myrepo/testdata/root/.svn/file git commit 

then switched development branch, merged feature branch in, , checked in:

git checkout develop git merge --squash feature git commit git svn dcommit 

i'm surprised this, however, didn't merge in .svn removal change. double checked ~/.gitignore, ~/.gitignore_global, repo's .gitignore. didn't include .svn, should irrelevant since checkin worked .svn folder time.

can explain happened here???

update 2

seems re-checking in git rm change development branch still doesn't solve issue. svn co still fails @ same place same error.

i found cause , solution.

the git change had removal of file .svn/file. git automatically removes .svn folder local git repo. folders first-class citizen in svn. .svn folder didn't removed when doing git svn dcommit.

i ended having do

svn del http://mysvnserver/myrepo/testdata/root/.svn -m "remove .svn folder" 

to remove folder separately. after can svn co normally.

problem solved.