有没有办法使用 svn:mergeinfo 关闭 TortoiseSVN? [英] Is there a way to turn TortoiseSVN using svn:mergeinfo off?

问题描述

当我进行 TortoiseSVN 合并时，它包含一堆目录和一些文件到修改后的文件中，即使没有实际更改.

When I'm doing a TortoiseSVN merge, it includes a bunch of directories, and some files into the modified files, even though there are no actual changes.

它改变了svn:mergeinfo属性.

为什么需要在目录/文件上设置这些属性?有没有办法避免对 svn:mergeinfo 进行这些更改?

Is there any reason why these properties set on the directory/files are needed? Is there any way to get around not doing these changes to svn:mergeinfo?

我通常只是还原项目然后提交，但这会浪费额外的时间.

I usually just revert the items then commit, but this wastes extra time.

推荐答案

这种情况很可能发生，因为这些文件和目录具有从先前合并中设置的 svn:mergeinfo 属性.我认为以导致将合并信息写入单个文件的方式合并单个文件或目录通常不是一个好主意.您应该养成在工作流可能的最高级别进行合并的习惯，以便仅在结构目录上设置 mergeinfo 属性，例如/trunk 或/branches/1.0.

That is happening, very likely, because those files and directories have the svn:mergeinfo property set from a previous merge. I don't think it's generally a good idea to merge individual files or directories in a way that causes the mergeinfo to be written to individual files. You should get into the habit of merging at the highest level possible for your workflow, so that the mergeinfo property is only set on structural directories, such as /trunk or /branches/1.0.

但是，如果您确实发现自己在单个文件和文件夹上具有 mergeinfo 属性，那么您可以做两件事:第一件事是简单地从相关文件和目录中删除 svn:mergeinfo 属性.我不确定是否推荐这样做，除非您真的知道自己在做什么以及可能产生的影响.执行此操作之前请阅读文档！

However, if you do find yourself with mergeinfo properties on individual files and folders, there are two things you can do: the first thing is simply to remove the svn:mergeinfo property from the files and directories in question. I'm not sure this is recommended unless you really know what you're doing, and what the effects might be. Read the documentation before you do this!

您可以做的第二件事是按照 SVN 希望您的方式提交属性更改，如果您信任该软件，这可能是正确的做法.

The second thing you can do is commit the property changes the way SVN wants you to, which, if you trust the software, is probably the right thing do.

话虽如此，我一直在和我的队友一起努力养成正确的习惯，这样我们就不会再有这种烦恼了.

That having been said, I've been working with my teammates to get in the right habits so that we don't have this annoyance any more.

这篇关于有没有办法使用 svn:mergeinfo 关闭 TortoiseSVN?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！