Subclipse:如何保持分支同步?
我将如何执行描述的操作 这里,使用 subclipse 插件从命令行非常简单?
我想我会确保我的工作副本与分支同步,然后我会转到“合并...”。 我不知道在弹出窗口中该怎么做!
编辑:我在某处读到,在弹出窗口中,我必须将合并范围指示为主干修订的范围:从打开分支的修订到 HEAD。 说得通。 但我现在正在通过一个测试项目尝试这一点,但我没有在指向分支的工作副本上得到新的主干更改。 我一定是错过了什么,或者它不起作用!
注意:子剪辑 1.4.8
¿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!
Edit: 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!
Note: Subclipse 1.4.8
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
我现在明白了。 这就是我在编辑中所说的,正如在许多网站上读到的那样......
显然很多人对 from-to 范围感到困惑。 这是您要合并的主干/分支的修订范围。。 这些更改将合并到您在包资源管理器中选择的工作副本中。
我所说的尽管这样做但无法使其正常工作是由于我选择主干 URL 时的错误:该项目位于存储库中的子文件夹下方。
I got it now. It's how I said in the edit, as read in a number of websites...
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(在没有其他信息的情况下),请选择“
合并一系列修订
”和“下一步 >
”——您应该能够在下一页的“合并自:
”框中选择主干(或其他适当的源)。Assuming you're using the latest version of Subclipse (in the absence of information otherwise), select "
Merge a range of revisions
" and "Next >
" -- you should be able to select the trunk (or another appropriate source) in the "Merge from:
" box on the next page.