nirvdrum / svn2git

Ruby tool for importing existing svn projects into git.
MIT License
2.11k stars 443 forks source link

Command failed with untracked working tree files #282

Open tomasdelvechio opened 5 years ago

tomasdelvechio commented 5 years ago

Hi! I tried to migrate a old svn repository to git but this migration failed always at the same point:

$ svn2git url-repository --exclude .htaccess -v

Running command: git svn init --prefix=svn/ --no-metadata --trunk='trunk' --tags='tags' --branches='branches' url-repository
Running command: git config --local --get user.name
Running command: git config --local svn.authorsfile ~/.svn2git/authors
Running command: git svn fetch --ignore-paths='^(?:trunk[/]|tags[/][^/]+[/]|distrito3[/][^/]+[/])(?:.htaccess)' 
Running command: git branch -l --no-color
* master
Running command: git branch -r --no-color
  svn/trunk
  svn/trunk@102
Running command: git branch --track "trunk@102" "remotes/svn/trunk@102"
fatal: Cannot setup tracking information; starting point 'remotes/svn/trunk@102' is not a branch.
Running command: git checkout -b "trunk@102" "remotes/svn/trunk@102"
error: The following untracked working tree files would be overwritten by checkout:
        .htaccess
Please move or remove them before you switch branches.
Aborting
command failed:
git checkout -b "trunk@102" "remotes/svn/trunk@102"

I look at on issues but I not found any help.

What is wrong with this repo?