[英]Tortoise SVN automatic merge - disable doesn't work
In my company we are using TortoiseSVN with automatic merges turned off this way( http://tortoisesvn.tigris.org/faq.html#noautomerge ). 在我的公司,我们使用TortoiseSVN自动合并关闭( http://tortoisesvn.tigris.org/faq.html#noautomerge )。 But when I am merging range of revision(feature branch), Tortoise do automatic merges, despite my setting. 但是当我合并修改范围(功能分支)时,Tortoise会自动合并,尽管我的设置。 During Update automatic merge correctly fails as I expected. 在更新期间,自动合并正确地失败,如我所料 Tortoise version, merge tool setup, diff tool setup are in attachement. Tortoise版本,合并工具设置,diff工具设置都是附件。 Please help me. 请帮我。 Thanks 谢谢
EDIT: added [helpers] section of SVN config file 编辑:添加了SVN配置文件的[helpers]部分
### Section for configuring external helper applications.
[helpers]
### Set editor-cmd to the command used to invoke your text editor.
### This will override the environment variables that Subversion
### examines by default to find this information ($EDITOR,
### et al).
# editor-cmd = editor (vi, emacs, notepad, etc.)
### Set diff-cmd to the absolute path of your 'diff' program.
### This will override the compile-time default, which is to use
### Subversion's internal diff implementation.
# diff-cmd = diff_program (diff, gdiff, etc.)
diff-cmd = "C:\\SVNNoMerge.bat"
diff3-cmd = "C:\\SVNNoMerge.bat"
### Diff-extensions are arguments passed to an external diff
### program or to Subversion's internal diff implementation.
### Set diff-extensions to override the default arguments ('-u').
# diff-extensions = -u -p
### Set diff3-cmd to the absolute path of your 'diff3' program.
### This will override the compile-time default, which is to use
### Subversion's internal diff3 implementation.
# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
### Set diff3-has-program-arg to 'yes' if your 'diff3' program
### accepts the '--diff-program' option.
# diff3-has-program-arg = [yes | no]
### Set merge-tool-cmd to the command used to invoke your external
### merging tool of choice. Subversion will pass 5 arguments to
### the specified command: base theirs mine merged wcfile
# merge-tool-cmd = merge_command
您还必须为diff3-cmd
设置false.bat文件,而不仅仅是常见问题解答中所述的diff-cmd
部分。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.