2013-02-11 71 views
1

为什么我得到这个错误尝试使用svn与git。我正在执行以下步骤并发生一些疯狂的错误。为什么我得到这个错误试图与svn使用git

git svn clone -s http://svn/java/project project 
cd project 
git svn show-ignore > .gitignore 
git checkout -b dev 

我得到outpput

M src/main/java/app.properties 
M src/main/java/messages.properties 
M src/main/java/org/xxxxx/enrollment/dao/projectDao.java 
M src/main/resources/app.properties 
M src/main/webapp/WEB-INF/flows/start/footer.jsp 
M src/main/webapp/WEB-INF/flows/start/header_edit.jsp 
M src/main/webapp/WEB-INF/flows/start/tobe.jsp 
M src/main/webapp/WEB-INF/spring/mvc.xml 
M src/main/webapp/index.jsp 
M src/test/resources/app.properties 
M src/test/resources/messages.properties 
M src/test/resources/mvc.xml 
Switched to a new branch 'dev 

'

git svn rebase 

我得到这个输出以下

src/main/java/app.properties: needs update 
src/main/java/messages.properties: needs update 
src/main/java/org/xxxx/enrollment/dao/projectDao.java: needs update 
src/main/resources/app.properties: needs update 
src/main/webapp/WEB-INF/flows/start/footer.jsp: needs update 
src/main/webapp/WEB-INF/flows/start/header_edit.jsp: needs update 
src/main/webapp/WEB-INF/flows/start/tobe.jsp: needs update 
src/main/webapp/WEB-INF/spring/mvc.xml: needs update 
src/main/webapp/index.jsp: needs update 
src/test/resources/app.properties: needs update 
src/test/resources/messages.properties: needs update 
src/test/resources/mvc.xml: needs update 
update-index --refresh: command returned error: 1 

请帮我

+0

在您尝试创建新分支之前,“master”中的'git status'是什么意思? – chepner 2013-02-11 20:52:23

+0

您是否处于混合操作系统开发环境中,其中不同用户可能位于具有不同行结束约定(Windows vs Linux vs MacOS)的系统上? – twalberg 2013-02-11 22:19:32

回答

0

由于mentioned通过twalberg,并在issue 103所示,请确保您键入,克隆和重订基期:

git config --global core.autocrlf false 

你不想Git会自行进行任何更改(如“Error rebaseing/updating a git-svn repository”)。

+0

这个提交做了什么 – techsjs2013 2013-02-12 13:26:05

+0

@ techsjs2013 commit?它会在你的全局gitconfig(〜/ .gitconfig)中添加一个条目,以确保它不会改变行尾(我错误地提到'fileMode':我用'autocrlf'代替它) – VonC 2013-02-12 13:39:18

+0

@ techsjs2013 a有点像在http://stackoverflow.com/a/13888206/6309。对于'autocrlf',请参阅http://stackoverflow.com/questions/2825428/why-should-i-use-core-autocrlf-true-in-git和http://stackoverflow.com/questions/2333424/distributing- GIT中的配置与 - 的代码/ 2354278#2354278 – VonC 2013-02-12 13:43:50

相关问题