从父分支更新分支？
在 CVS 中，我有一个分支 (b) 与另一个分支 (a) 相连，该分支位于躯干/头部之外。
分支 (a) 中修复了一些错误，我想继续在分支 (b) 中使用它们。如何将这些修复拉到我的 Eclipse 分支中？
head
|
v
a (with bug fixes)
|
v
b (needs bug fixes)
In CVS I have a branch (b) off another branch (a) which is off the trunk/head.
Some bug fixes were made in branch (a) that I'd like to go ahead and use in branch (b). How can I pull those fixes into my branch in Eclipse?
head
|
v
a (with bug fixes)
|
v
b (needs bug fixes)
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
理想情况下，您需要在
a上为要合并的每个功能添加两个标签，然后将这两个标签之间的差异合并到b中。但是，您还需要记住已经合并了哪些，因为 CVS 不记得这一点。当我在一家使用 CVS 和分支的公司工作时，我们的政策是应该由其他分支使用的分支（在本例中为
a）的错误修复需要首先合并到主干中，所有其他分支都从那里合并它们。然而，如果你想挑选个别的错误修复，这仍然是非常痛苦的。本质上，您必须记住您合并的每个修复（通过两个标签，标记构成该修复的更改的开始和结束）。
一般来说，在 CVS 中，最好记住（在标签中）您已合并到哪个版本，然后将其中的所有内容合并到头部（然后将标签移动到头部）。在 CVS 中，挑选是痛苦的，并且要求您将合并历史记录存储在某个地方。
Ideally what you need is to have two tags on
afor every feature you want to merge, and then merge the difference between those two tags intob. However, you would also need to remember which ones you have already merged, because CVS doesn't remember that.When I was working in a company that used CVS and branches, our policy was that bugfixes from branches (
ain this case) that ought to be used by other branches need to get merged into the trunk first, and all the other branches merge them from there.However, it was still very painful if you wanted to cherry-pick individual bugfixes. Essentially, you'd have to remember every fix you've merged (by two tags, marking the beginning and the end of the changes making up that fix).
Generally, in CVS it's much better to remember (in a tag) up to which revision you have merged, and merge everything from there to the head (and then move the tag to the head). In CVS, cherry-picking is painful and requires you to store the merge history somewhere.