How can I view a list of all files with conflicts in a Tortoise SVN Repository?

时光怂恿深爱的人放手 提交于 2019-12-12 09:32:16

问题


Is there any way to get a list of files that are in a (SVN) conflicted state using Tortoise SVN?


回答1:


To do this, right-click on the folder containing the conflicts you wish to see, then click Resolve....

Note that this is something of a side-effect, since this option is (generally) for marking conflicts as resolved. It is also, however, intended to help you actually find and resolve the conflicts. The behavior is as follows:

A window will appear that lists all the file conflicts, with check-boxes next to them. If you double-click on a file name, Tortoise will bring up the Merge window for that file. When you've selected the files you want to mark as resolved (using the check-boxes), you can do so by clicking "Ok," or you can simply exit the window without changing the resolution status of any conflicts by clicking "Cancel."




回答2:


You can't do it with TSVN, but it's rather easy for CLI-interface.

Just use svn status inside your WC and check output:

  The first seven columns in the output are each one character wide:
    First column: Says if item was added, deleted, or otherwise changed
    ...
      'C' Conflicted



回答3:


Inside "Check for modifications" theres another button...

... "check repository" it will show conflicts

This is my source



来源:https://stackoverflow.com/questions/14527784/how-can-i-view-a-list-of-all-files-with-conflicts-in-a-tortoise-svn-repository

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!