我可以在 Subversion 中关闭自动合并吗? [英] Can I turn off automatic merging in Subversion?

问题描述

我们正在考虑从版本控制系统的签出/编辑/签入风格转移到 Subversion，并且在评估期间我们发现当您在 TortoiseSVN(并且大概在任何 Subversion 客户端)中执行更新操作时?)，如果需要应用于您正在编辑的文件的存储库中的更改不会引起任何冲突，那么它们将自动/静默合并.

We're looking at moving from a check-out/edit/check-in style of version control system to Subversion, and during the evaluation we discovered that when you perform an Update action in TortoiseSVN (and presumably in any Subversion client?), if changes in the repository that need to be applied to files that you've been editing don't cause any conflicts then they'll be automatically/silently merged.

这让我们有点害怕，因为这种合并虽然不会产生任何编译错误，但至少可能会引入一些不容易检测到的逻辑错误.

This scares us a little, as it's possible that this merge, while not producing any compile errors, could at least introduce some logic errors that may not be easily detected.

非常简单的例子:我在 C# 方法中工作，在方法的后半部分更改了一些逻辑，而其他人在方法开始时更改了变量被初始化的值.其他人的更改不在我正在处理的代码行中，因此不会发生冲突；但可以显着改变方法的输出.

Very simple example: I'm working within a C# method changing some logic in the latter-part of the method, and somebody else changes the value that a variable gets initialised to at the start of the method. The other person's change isn't in the lines of code that I'm working on so there won't be a conflict; but it's possible to dramatically change the output of the method.

我们希望情况是，如果需要进行合并，那么将显示两个文件，并至少显示一个简单的接受/拒绝更改选项，以便至少我们知道某些事情已更改，并且可以选择查看它是否影响我们的代码.

What we were hoping the situation would be is that if a merge needs to occur, then the two files would be shown and at least a simple accept/reject change option be presented, so that at least we're aware that something has changed and are given the option to see if it impacts our code.

有没有办法用 Subversion/TortoiseSVN 做到这一点?或者我们是否过于拘泥于我们目前的工作方式，应该让它去做它的事情......

Is there a way to do this with Subversion/TortoiseSVN? Or are we stuck in our present working ways too much and should just let it do it's thing...

推荐答案

解决此问题的最佳方法是教育开发人员.在 TortoiseSVN 中进行更新后，它会向您显示受影响文件的列表.只需双击每个文件即可查看它们之间的差异.然后，您将能够看到您的版本与最新的存储库版本之间发生了什么变化.

The best way around this is to educate the developers. After you do an update in TortoiseSVN it shows you a list of affected files. Simply double clicking each file will give you the diff between them. Then you'll be able to see what changed between your version and the latest repository version.

这篇关于我可以在 Subversion 中关闭自动合并吗?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！