There is a commercial tool for exactly that use case called Semantic Merge. They provide a 15-day free trial, open source projects may use it for free (contact the support).
Keep renaming seperate from other refactorings. They can generally be automated and therefore making the changes is easy. You can even distribute scripts to allow other engineers with merge hell to perform the transformations on there files.
There is no easy way to automate refactorings, so keep it simple. A rename should only take minutes and you should be able to check out and commit with minimal testing.
假设至少 VS 2005 并且全局重命名是变量/属性/函数，则可以使用“重构 - 重命名”右键菜单选项。 根据设计，它会在整个解决方案中传播名称更改。
Assuming at least VS 2005 and the global rename is a variable/property/function, there is a Refactor - Rename right-click menu option you could use. By design it propagates the name change in your entire solution.
I understood your problem. Unfortunately, I think there isn't a SVN script smart enough to do this job while syncing.
Maybe your team working more appropriately with SVN could make this situation be unpainful. When you do an svn:update in your working copy and realize merging operations, it is a good practice to rebuild the updated solution before do commit the changes.
Having a svn script with the ability to doing it automagically when merging would be great, indeed.
发布评论
评论（5）
有一个专门针对该用例的商业工具，称为语义合并。 他们提供 15 天免费试用，开源项目可以免费使用它（联系支持人员） 。
语义合并背后的公司也有一个集成了 Sematic Merge 的 git 客户端，目前是测试版（这里有一些简短的介绍视频）。
There is a commercial tool for exactly that use case called Semantic Merge. They provide a 15-day free trial, open source projects may use it for free (contact the support).
The company behind semantic merge also has a git client with integrated Sematic Merge which is currently beta (here, have some short intro videos).
将重命名与其他重构分开。 它们通常可以自动化，因此更改很容易。 您甚至可以分发脚本，以允许其他患有合并地狱的工程师对这些文件执行转换。
自动化重构没有简单的方法，所以要保持简单。 重命名应该只需要几分钟，您应该能够通过最少的测试来签出并提交。
Keep renaming seperate from other refactorings. They can generally be automated and therefore making the changes is easy. You can even distribute scripts to allow other engineers with merge hell to perform the transformations on there files.
There is no easy way to automate refactorings, so keep it simple. A rename should only take minutes and you should be able to check out and commit with minimal testing.
假设至少 VS 2005 并且全局重命名是变量/属性/函数，则可以使用“重构 - 重命名”右键菜单选项。 根据设计，它会在整个解决方案中传播名称更改。
Assuming at least VS 2005 and the global rename is a variable/property/function, there is a Refactor - Rename right-click menu option you could use. By design it propagates the name change in your entire solution.
是否可以减少提交更改所需的时间？ 提交之间的一个或多个星期似乎很长......
Wouldn't it be possible to reduce the time needed for you to commit your changes? One or more week seems quite long between commits...
我明白你的问题。 不幸的是，我认为没有足够智能的 SVN 脚本可以在同步时完成这项工作。
也许您的团队更恰当地使用 SVN 可以使这种情况变得不那么痛苦。 当您在工作副本中执行 svn:update 并实现合并操作时，最好在提交更改之前重建更新的解决方案。
拥有一个能够在合并时自动执行此操作的 svn 脚本确实很棒。
I understood your problem. Unfortunately, I think there isn't a SVN script smart enough to do this job while syncing.
Maybe your team working more appropriately with SVN could make this situation be unpainful. When you do an svn:update in your working copy and realize merging operations, it is a good practice to rebuild the updated solution before do commit the changes.
Having a svn script with the ability to doing it automagically when merging would be great, indeed.