search

nirvdrum / svn2git

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

Failed svn2git --rebase #45

Closed kierzniak closed 12 years ago

kierzniak commented 12 years ago

Hi, when i want to update git repository by 'svn2git --rebase -v' get the following error:

Running command: git checkout -f "1.5"
warning: refname '1.5' is ambiguous.
Switched to branch '1.5'
Running command: git rebase "remotes/svn/1.5"
warning: refname '1.5' is ambiguous.
First, rewinding head to replay your work on top of it...
error: Ref refs/heads/1.5 is at d434cf859d6783e63f72284969d7f24eb209209d but expected 07d2fb116c246774eb8f09dc4bdbbc8b63c11f5c
fatal: Cannot lock the ref 'refs/heads/1.5'.
Could not move back to refs/heads/1.5
command failed:
2>&1 git rebase "remotes/svn/1.5"
stas commented 12 years ago

You can easily fix this by deleting your problematic branches and run again svn2git. Don't worry, nothing will be lost!

osterman commented 12 years ago

Deleting the affected branch(es) and rebase'ing does work around the problem, however, does not fix it. The next time I run --rebase, I run into the same exact issue again.

Psychoboy commented 10 years ago

I am getting this error as well. Was there any way to resolve this?