Subclipse：如何保持分支同步？ [英] Subclipse: how to keep a branch in sync?

问题描述

¿我将如何操作描述这里，这是非常简单的命令行，与subclipse插件？

¿How would I do the operation described here, which is very simple from the command line, with the subclipse plugin?

我想我会确定我的工作副本与分支机构同步，然后我会去合并...。我不知道在弹出窗口中该怎么做。

I think I would make sure that my working copy is in sync with the branch, then I would go to "Merge...". I'm not sure what to do in the popup!

编辑：我已经读过某个地方，在弹出窗口中，我必须将合并范围指定为一系列的修改版本：从分公司开放的修订，到头颅。说得通。但是我现在正在尝试这个测试项目，而且我没有在指向分支的工作副本上找到新的中继线更改。我必须缺少一些东西，或者它不工作！

I have read somewhere that in the popup I must indicate the merge range as a range of trunk revisions: from the revision where the branch was opened, to HEAD. Makes sense. But I'm trying this out now with a test project and I don't get the new trunk changes on the working copy that points to the branch. I must be missing something, or it's not working!

注意：Subclipse 1.4.8

Note: Subclipse 1.4.8

推荐答案

我现在得到了这是我在编辑中所说的，如在许多网站上阅读...

I got it now. It's how I said in the edit, as read in a number of websites...

在弹出窗口中，我必须指出合并范围为一系列干线修改：从分支开放的修订，到头部。

in the popup I must indicate the merge range as a range of trunk revisions: from the revision where the branch was opened, to HEAD.

显然，很多人都对从到范围感到困惑。这是您要从合并的中继线/分支的修订版本的范围。这些更改将合并到您在程序包资源管理器中选择的工作副本中。

Apparently many people get confused with the from-to range. This is the range of revisions of the trunk/branch you're merging from. These changes are merged into the working copy you selected in the package explorer.

尽管这样做，我所说的没有得到它的工作是由于我在选择中继网址时的错误：项目在存储库中的子文件夹下。

What I said about not getting it to work in spite of doing this was due to my mistake in selecting the trunk URL: the project was below a subfolder in the repository.

这篇关于Subclipse：如何保持分支同步？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！