在 Sourcesafe 中合并文件
总之，
我目前有两个项目位于 SourceSafe 下，由于多种原因我无法迁移到我们的 SVN 服务器。
然而，我目前正在尝试将一个项目的修复合并到另一个项目中。
我知道 Sourcesafe 在这方面并不是最好的，但我刚才经历的过程特别乏味
- 比较识别文件 我需要合并的更改。
- 复制和 将相关更改粘贴到 所需的项目
- 测试
- 提交
这看起来并不算太糟糕，但由于需要审查多个更改和多个文件，这正在成为一场噩梦。
有没有人有任何其他方法来执行此操作？
All,
I currently have two projects that are under SourceSafe that I am unable to migrate to our SVN server for a number of reasons.
However I am currently in the process of trying to merge fixes from one project into the other.
I know Sourcesafe isn't the best at this but the process I am going through just now is particularly tedious
- Compare the files identyfying the
changes I need to merge. - copy and
paste the relevant changes into the
desired project - Test
- Commit
This doesn't seem too bad but with multiple changes and multiple files that need reviewed this is becoming a nightmare.
Does anyone have any other methods to carry this out??
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
检查不同的版本并使用第三方工具来合并它们可能是值得的。 看一下 kdiff3 (http://kdiff3.sourceforge.net/) - 它在 Linux 或Windows 会非常智能地合并多达 3 个不同的版本。 这使您可以比较两个开发人员对公共基础版本的更改。
另一个有用的工具是 kompare，它在突出显示两个文件之间非常具体的差异方面做得非常出色。
祝你好运！
It might be worthwhile to check out the different versions and use a 3rd-party tool to merge them. Take a look at kdiff3 (http://kdiff3.sourceforge.net/) -- it runs on linux or Windows and will merge up to 3 different versions quite intelligently. This allows you to compare two developers' changes to a common base version.
Another useful tool is kompare, which does an admirable job of highlighting very specific differences between two files.
Good luck!
老实说，在 VSS 中合并非常糟糕，我个人会将项目的两个版本都签入 SVN 中，并在两个目录树之间进行比较，以找出差异。
这至少会让第一步变得非常简单。 如果您不允许在 SVN 服务器上执行此操作，请临时使用 TortoiseSVN 在磁盘上创建一个本地存储库来完成该任务。
Honestly, merging in VSS is so bad, I personally would check in both versions of your project into SVN and do a diff between the two directory trees to come up with your differences.
That will at least make Step #1 really easy. If you aren't allowed to do this on your SVN server, create a local repository on your disk using TortoiseSVN temporarily to accomplish the task.
winmerge可以与sourcesafe结合使用。
支持文件夹比较。
winmerge can combine with sourcesafe.
support folder comparision.