如何比较/合并更改部署项目文件 [英] How to diff/merge changes to a deployment project file
问题描述
我目前使用CVS（不是我的选择），并有几个分支。我试图合并两个分支，而是一个部署项目文件，我无法解析，无需花费大量的时间冲突。以下是一个小的变化到项目文件会导致剧烈的变化到项目文件 - 感谢GUID的变化我想（做一个项目文件的变化，得到一个干净的副本，使同样的变化似乎得到两个相当不同的项目文件）
I am currently using CVS (not my choice) and have several branches. I'm trying to merge two branches, but a deployment project file has conflicts that I can't resolve without spending a LOT of time. A trivial change to a project file results in drastic changes to that project file - thanks to GUID changes I guess (making a project file change, getting a clean copy and making the same change seems to yield two fairly different project files)
所以，我需要确定所有作了这样的实际变化，我可以手动复制它们（作为变更日志不够详细）。
So I need to determine all the actual changes that were made so I can replicate them by hand (as the change logs aren't detailed enough).
是否有任何项目文件的diff工具，需要改变的GUID /位置考虑？
Are there any project file diff tools that take changed GUIDs / positions into account?
推荐答案
您可以使用一个外部diff工具先解决分歧，然后报告了真正的差异（和忽略在不同的位置相同的GUID）。
You could use an external diff tool to resolve the differences first, then report the real differences (and ignoring the same GUIDs in different positions).
例如， 的WinMerge 能够检测到类似的线在不同地方的两个文件之间
For instance, WinMerge is able to detect similar lines in different places between two files.
借助位置窗格中可以表明，移动差块。
移动块的差值的是在不同的地点，双方。移动块由已移动和选择移动差异的颜色（在选项的WinMerge配置）并且通过连接它们的位置在左，右位置条线表示。
The Location pane can indicate difference blocks that are moved.
Moved blocks are two sides of a difference that are in different locations. Moved blocks are indicated by the Moved and Selected Moved difference colors (configurable in WinMerge Options) and by lines connecting their locations in the left and right location bars.
如果你忽略这些移动块（这是默认设置），你可以专注于实际的差异和举报你想要的修改。
If you ignore those moved blocks (which is the default setting), you can focus on the actual differences and report the modification you want.
如果这些GUID的不断变化，你可以定义一个正则表达式帮助的WinMerge忽视这些的GUID（喜欢的话可以在默认情况下忽略所有空格），帮助它专注于文档的其余部分。
If those GUIDs keep changing, you can define a regex pattern helping WinMerge to ignore those GUIDs (like it can ignore by default all whitespace), helping it to focus on the rest of the document.
这篇关于如何比较/合并更改部署项目文件的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
