重新设置/更新 git-svn 存储库时出错 [英] Error rebaseing/updating a git-svn repository
问题描述
希望这不是重复,我没有找到任何关于如何更新 git-svn 存储库的简明信息.我使用 git svn clone 将一个 SVN repo 导入到 git 中.然后,在做了一些提交之后,我想根据原始 SVN 存储库进行重新设置.
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:Workosqa>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
当我第二次重复 git svn rebase 命令时,我只得到最后一条消息的尾部:
When I repeated the git svn rebase command a second time, I got just the tail of the last message:
C:Workosqa>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?
推荐答案
如果我没记错的话,这意味着该文件有未提交的更改.git status
的输出是什么?
If I recall correctly, that means that there are uncommitted changes to that file. What's the output of git status
?
这篇关于重新设置/更新 git-svn 存储库时出错的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!