Search code examples
svngitgit-svn

Error rebaseing/updating a git-svn repository


Hoping this is not a dup, I didn't find any concise information on how to update a git-svn repo. I used git svn clone to import an SVN repo into git. Then, after doing some commits, I wanted to rebase with regards to the original SVN repo.

C:\Work\osqa>git svn rebase
Migrating from a git-svn v1 layout...
Data from a previous version of git-svn exists, but
        .git/svn
        (required for this version (1.7.3.1.msysgit.0) of git-svn) does not exis
t.
Done migrating from a git-svn v1 layout
forum/views/readers.py: needs update
update-index --refresh: command returned error: 1

When I repeated the git svn rebase command a second time, I got just the tail of the last message:

C:\Work\osqa>git svn rebase
forum/views/readers.py: needs update
update-index --refresh: command returned error: 1

I'm not sure what the error message means. Can you help resolve it?


Solution

  • If I recall correctly, that means that there are uncommitted changes to that file. What's the output of git status?