2012-06-05 92 views
1

我正在使用git-svn(来自cygwin),并且我在本地做了几次git提交。我已经完成了git svn rebase,它检出了SVN中的最新更改,并成功将其与本地git副本合并。git svn抱怨路径未被锁定

C:\src\git\MyProject>git svn rebase 
Current branch master is up to date. 

C:\src\git\MyProject>git status 
# On branch master 
nothing to commit (working directory clean) 

C:\src\gitsvn\MyProject>git svn dcommit 
Committing to http://mysvnrepo/svn/MyProject ... 
     M  .gitignore 
     M  trunk/module/src/main/webapp/file_1.html 
     M  trunk/module/src/main/webapp/js/file_2.js 
     A  trunk/module/src/main/webapp/js/file_3.js 
     M  trunk/module/src/main/webapp/js/file_4.js 
     M  trunk/module/src/main/webapp/js/file_5.js 
     M  trunk/module/src/main/webapp/file_6.html 
     M  trunk/module/src/main/webapp/file_7.html 
Path is not locked: No lock on path '/svn/MyProject/!svn/wrk/0c6b9b9e-3155-41d8-aa30-979cc5815cee/trunk/module/src/main/webapp/file_8.html' (Status 423 on PUT Request): Server sent unexpected return value (423 Locked) in response to PUT request for '/svn/MyProject/!svn/wrk/0c6b9b9e-3155-41d8-aa30-979cc5815cee/trunk/module/src/main/webapp/file_8.html' at /usr/lib/git-core/git-svn line 922 

任何想法出了什么问题?

回答

0

只好做一个svn解锁来解决这个问题。