使用 svn 一次删除多个目录，这样我就可以用同名的新目录替换它们
我发现有很多 svn 命令可以删除目录和文件。不幸的是，每次运行这些命令时，我都会收到奇怪的错误，例如“不受版本控制”或“冲突”。我只是在寻找一个简单的 svn 命令，它允许我删除下面的 MARKT 目录下的所有目录，这样我就可以创建与我删除的目录具有相同名称的新目录，而不会产生任何冲突：
[root@Proxima marketing]# cd MARKT
[root@Proxima MARKT]# ls
app Capfile config db doc IDENTIFIED lib log public Rakefile README README.txt script test tmp vendor
我正在使用苹果系统。 感谢您的任何回复。
我尝试删除一个目录并提交，然后得到以下结果：
Commit failed (details follow):
Aborting commit: '/Users/jmerlino/MARKSITE AUGUST/db' remains in tree-conflict
事实上，我为每个目录都遇到了树冲突。
I find a lot of svn commands out there to delete directories and files. Unfortunately, every time I run these commands, I get strange errors afterwards like 'not under version control' or 'conflict'. I'm just looking for a straightforward svn command that will allow me to delete all the directories under the MARKT directory below so I can then create new directories with the same nanme as the one I deleted, without any conflict arising:
[root@Proxima marketing]# cd MARKT
[root@Proxima MARKT]# ls
app Capfile config db doc IDENTIFIED lib log public Rakefile README README.txt script test tmp vendor
I'm using mac OSX.
Thanks for any response.
I try to delete a directory and commit and I get this:
Commit failed (details follow):
Aborting commit: '/Users/jmerlino/MARKSITE AUGUST/db' remains in tree-conflict
In fact, I get this tree conflict for every single directory.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
要删除 MARKT 下的目录：
要在 MARKT 下创建新目录：
To delete a directory under MARKT:
To create a new directory under MARKT:
意味着该目录已被合并，并且 svn 在它认为应该/不应该的情况下发现该目录丢失（或添加）。简而言之，它告诉你某件事是一个很大的错误，你需要在继续之前解决它（解决它）。
在对该 WC 执行任何操作之前，您必须先
svn解析父目录。 （好吧，如果您愿意重新开始，您可以svn revert）树冲突基本上是 svn 无法自行修复的 2 个不同目录树之间的合并。这是一个目录，它是一个包含文件列表的文件，如果你从这个文件中删除行（例如删除目录）或添加行（添加目录）然后合并这个“文件”，svn无法执行合并（例如当您在不同的合并目标上删除并添加相同的目录时），那么它会通过报告冲突来告诉您。然后由你来修复问题并告诉 svn 你已经修复了它。
means that the directory has been merged and svn has found the directory is missing (or added) when it thinks it should/ shouldn't be. In short, its telling you that something is a big wrong and that you need to sort it out (resolve it) before continuing.
You have to
svn resolvethe parent directory before you can do anything with that WC. (ok, you couldsvn revertis you prefer to start again)Tree conflicts are basically merges between 2 different directory trees that svn cannot fix by itself. This of a directory as a file with a list of files in it, if you delete lines from this file (eg delete directories) or add lines (add dirs) and then merge this 'file', and svn cannot perform the merge (eg as you've deleted and added the same dir on different merge targets) then it will tell you - by reporting a conflict. Its then up to you to fix things and tell svn you've fixed it.