复杂的 subversion 1.4 合并
我有一个长期运行的功能分支，需要合并回主干。但我很难正确地使用咒语，我需要一点帮助。
我的功能分支的日志如下所示（我正在简化以使其更容易）：
r170 fixed bug in boppity.py and snafu.py
r160 merged trunk revisions 131-159
r150 added boppity.py
r140 fixed bug in snafu.py
r130 merged trunk revisions 100-129
r120 fixed bug in foobar.py
r110 added foobar.py and snafu.py
r100 branch created
所以我认为我想做的是合并100-120、130-150、170。我不'我不认为我想要合并 130 或 160，因为这些更改已经存在于两个地方，并且很可能会给我带来树冲突。
（对于那些想知道为什么我不使用“重新集成”功能的人来说，这是因为我的 subversion 服务器仍然是 1.4，所以它没有该功能，AFAIK。）
I've had a long-running feature branch that needs to be merged back into the trunk. But I'm having a heck of a time getting the incantation right, and I could use a little help.
the log from my feature branch looks like this (I'm simplifying to keep this easier):
r170 fixed bug in boppity.py and snafu.py
r160 merged trunk revisions 131-159
r150 added boppity.py
r140 fixed bug in snafu.py
r130 merged trunk revisions 100-129
r120 fixed bug in foobar.py
r110 added foobar.py and snafu.py
r100 branch created
So what I think I want to do is merge 100-120, 130-150, 170. I don't think I want to merge 130 or 160 because those changes already exist in both places and will most likely give me tree conflicts.
(And for those of you who are wondering why I don't use the "reintegrate" feature, it's because my subversion server is still 1.4, so it does not have that feature, AFAIK.)
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您应该将主干中的所有修订合并到分支中，并解决所有冲突。
如果您仍在使用 SVN 1.4，请仔细检查所有重命名，因为它们未正确合并。
之后，通过比较分支和主干进行合并并将其应用到主干。
查看此处了解更多信息
You should merge all revisions from trunk into your branch, and resolve all conflicts
If you are still using SVN 1.4 look close for all renames as they are not correctly merged.
After this, do a merge by diffing your branch and trunk and apply it to your trunk.
Look here for further info