在父目录不再受版本控制之后,如何提交SVN删除?

时间:2011-05-26 19:21:50

标签: svn version-control commit

我正在清理一个Subversion目录,包括删除一个jquery-ui目录(我已经提交过),并将子目录的内容移动到其父目录。 (我在Linux命令行上工作。)

最后一长串尝试的解决方法提供了:

jonathan@machine:~/svn3/coms_poc_ajax/trunk/coms/static$ svn update jquery-ui
At revision 53.
jonathan@machine:~/svn3/coms_poc_ajax/trunk/coms/static$ svn delete jquery-ui
D         jquery-ui
jonathan@machine:~/svn3/coms_poc_ajax/trunk/coms/static$ svn commit jquery-ui
svn: Commit failed (details follow):
svn: '/svn/coms_poc_ajax/trunk/coms/static' path not found
svn: Your commit message was left in a temporary file:
svn:    '/home/jonathan/svn3/coms_poc_ajax/trunk/coms/static/svn-commit.2.tmp'

所以我尝试用源代码控制注册目录:

jonathan@machine:~/svn3/coms_poc_ajax/trunk/coms/static$ cd ..
jonathan@machine:~/svn3/coms_poc_ajax/trunk/coms$ svn add static
svn: warning: 'static' is already under version control
jonathan@machine:~/svn3/coms_poc_ajax/trunk/coms$ svn commit static
...
svn: Commit failed (details follow):
svn: File 'static/jquery-ui' is out of date
svn: '/svn/coms_poc_ajax/!svn/wrk/a41dde0b-6ccd-43cf-80d6-c237fc63ceda/trunk/coms/static/jquery-ui' path not found
svn: Your commit message was left in a temporary file:
svn:    '/home/jonathan/svn3/coms_poc_ajax/trunk/coms/svn-commit.3.tmp'

我需要做些什么才能驱除jquery-ui目录的ghost并恢复正常提交更新?

2 个答案:

答案 0 :(得分:0)

如果指定完整的URI,则可以直接在存储库中删除目录。

假设您的目录位于https://mysvn/svn3/coms_poc_ajax/trunk/coms/static/jquery-ui,您可以使用以下语句将其删除。

svn rm https://mysvn/svn3/coms_poc_ajax/trunk/coms/static/jquery-ui -m"removing jquery-ui"

答案 1 :(得分:0)

我尝试了两个答案,仍然在与Subversion作斗争。我做了一个新的结账,这似乎消除了服务器和我的副本之间的差异,关于目录X是否应该存在(至少现在)。