我在使用 SVN 时遇到问题。突然之间,我无法删除服务器上的文件。
目录显示如下,文件夹路径如下
dev:/usr/HTTPServer/htdocs/en_US/sc/us/en$
drwxrwxr-x 3 277 1 512 Jan 16 11:49 readynow/
-rw-rw-r-- 1 304 1 14812 Jan 11 11:19 readynow
我想删除没有斜线的 readynow 。
dev:/usr/HTTPServer/htdocs/en_US/sc$ svn revert readynow
svn: Cannot revert: 'readynow' is not under version control
svn status 向我显示了这个...味精,我似乎不理解(A + 符号),为什么我不能删除它 readynow
dev:/usr/HTTPServer/htdocs/en_US/sc$ svn st
D index-not-minified.html
A + readynow
当我运行 st 然后运行 svn ci -m "delete" 时,它会引发以下错误。
删除我们
/en/index-not-minified.html 添加我们/en/readynow
dev:/usr/HTTPServer/htdocs/en_US/sc$ svn st
svn: Commit failed (details follow):
svn: MERGE request failed on '/svn-sc/us/en'
svn:
Invalid changes line in rev-file