如何自动解决所有SVN冲突? (Windows CLI) [英] How can I resolve all SVN conflicts automatically? (Windows CLI)

问题描述

我正在尝试使某些Subversion流程自动化，并且遇到了冲突问题.当我合并两个分支时，有时会遇到树冲突和常规(文本)冲突.我希望能够使用存储库副本解决所有问题:

I'm trying to automate some Subversion processes and I'm running into problems with conflicts. When I merge two branches, sometimes I get tree conflicts and regular (text) conflicts. I'd like to be able to resolve everything using the repository copy:

svn resolve . -R --accept theirs-full

但是如果有树冲突，它会大吼大叫我并说我必须将它们解决为工作状态.

but if there are tree conflicts, it yells at me and says I have to resolve them to the working state.

svn:警告:树冲突只能 被确定为工作"状态； '文件' 未解决

svn: warning: Tree conflicts can only be resolved to 'working' state; 'file' not resolved

是否有一种简单的方法来解决 just 树冲突为有效"的问题，这样我就可以继续解决与它们完全冲突的文本冲突了吗?或者也许是另一种完全实现我的目标的方法?我正在寻找通过Windows命令行执行此操作.谢谢！

Is there an easy way to resolve just the tree conflicts to 'working' so that I can then continue to resolve the text conflicts with theirs-full? Or maybe another way to accomplish my goal entirely? I'm looking to do this through the Windows command line. Thanks!

Subversion服务器的版本为1.6.6

Subversion server is version 1.6.6

我正在使用CollabNet Subversion命令行客户端v1.6.13(适用于Windows)

I'm using CollabNet Subversion Command-Line Client v1.6.13 (for Windows)

推荐答案

您是否已检查 查看全文