我正在使用git-svn (来自cygwin),并且我已经在我的本地做了几个git提交。我已经做了git svn rebase,它检查了SVN中的最新变化,并成功地与我的本地git副本合并。
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你知道哪里出问题了吗?
发布于 2012-06-27 09:23:50
我不得不做一个svn解锁来解决这个问题。
https://stackoverflow.com/questions/10894172
复制相似问题