在Eclipse中进行Subversion合并的正确方法是什么？ [英] What is the proper way to do a Subversion merge in Eclipse?

问题描述

我非常习惯于如何在Eclipse中进行CVS合并，而对于Subclipse和Subversive与SVN存储库的工作方式，我感到非常高兴，但我不太清楚如何正确地进行合并。

当我进行合并时，似乎想将合并的文件粘贴到项目中的一个独立的目录中，而不是覆盖将要替换的旧文件合并，因为我习惯于CVS。

这个问题对于Subclipse或Subversive来说不是特别的。

感谢您的帮助！

解决方案

我建议不要尝试使用Eclipse的插件作为Subversion的主要访问。

如果您在Windows上开发，TortoiseSVN是我看到的Subversion访问中最好的程序。浏览到您要合并的目录，右键单击它并使用龟龟SVN合并选项。假设一个非交互式的合并，一旦遇到冲突，您必须经过每个冲突的文件并编辑冲突，然后再将其标记为已解决。对于这个过程，我推荐一个名为KDiff3的程序，它显示您的本地存储库副本（存储在合并之前的.svn中），本地副本（包括任何更改）以及来自存储库的副本，并允许您很容易看到（甚至需要手动修改）合并的结果。它还自动处理一连串轻微的冲突。

KDiff3是可移植的，TortoiseSVN是一个Windows shell扩展，所以如果你使用另一个环境，我会尝试使用SVN合并。但这更会是一个痛苦：）

I'm pretty used to how to do CVS merges in Eclipse, and I'm otherwise happy with the way that both Subclipse and Subversive work with the SVN repository, but I'm not quite sure how to do merges properly.

When I do a merge, it seems to want to stick the merged files in a seperate directory in my project rather than overwriting the old files that are to be replaced in the merge, as I am used to in CVS.

The question is not particular to either Subclipse or Subversive.

Thanks for the help!

解决方案

I would advise not trying to use Eclipse's plugins as your primary access to Subversion.

If you are developing on Windows, TortoiseSVN is the best program that I have seen for Subversion access. Explore to the directory of which you wish to merge, right click on it and use the Tortoise SVN merge option. Assuming a non-interactive merge, once you get conflicts, you'll have to go through each conflicted file and edit the conflicts before marking them as resolved. For this process I recommend a program called KDiff3, which shows your local repository copy (what was stored in the .svn before the merge), your local copy (including any changes), and the copy coming from the repository, and allows you to easily see (and even hand-modify if needed) the result of the merging. It also handles a bunch of minor conflicts automatically.

KDiff3 is portable, TortoiseSVN is a windows shell extension, so if you're using another environment, I would try to just use SVN to merge. But that would be much more of a pain :)

这篇关于在Eclipse中进行Subversion合并的正确方法是什么？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！