简体   繁体   English

如何撤消SVN中的-R状态(标记为删除)

[英]How to undo an -R status (marked for deletion) in SVN

I'm trying to add a_folder to SVN but I accidentally scheduled my root directory for deletion: 我正在尝试向SVN添加a_folder,但我不小心安排了我的根目录进行删除:

[phil@sessions www]$svn status
R      .
A      a_folder

I can't commit a_folder's adding because... 我无法提交a_folder添加,因为......

[phil@sessions www]$ svn commit a_folder-m "adding"
svn: Commit failed (details follow):
svn: '/home/phil/www' is not under version control and is not part of the commit, yet its child '/home/phil/www/a_folder' is part of the commit

If I try "svn add ." 如果我尝试“svn add”。 I get "www is already under version control". 我得到“www已经在版本控制下”。 How can I remove this status so that I can go on with my life? 如何删除此状态以便我可以继续我的生活?

svn revert .

My problem was in a single folder, so I resolve in this way: 我的问题是在一个文件夹中,所以我这样解决:

cd Project
svn revert Folder
cd Folder
svn add --force .
cd .. && svn commit -m "resolved svn inconsistency"

Here a usefull link with the list of all status. 这里有一个与所有状态列表有用的链接。

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM