问题描述
一直在使用带有 Tortoise 1.6 的 SVN 分支.我一直在定期将主干合并到分支中以使其保持最新状态.
Been using SVN branches with Tortoise 1.6. I've been periodically merging the trunk into the branch to keep it up to date.
今天，我想我会重新整合分支.我从 Tortoise 中选择了重新集成分支"并收到以下错误消息:
Today, I thought I'd reintegrate the branch. I chose "Reintegrate a branch" from Tortoise and received the following error message:
Reintegrate 只能在 4709 到 5019 之前从 http://subversion/svn/saxdev/trunk 合并到 reintegrate 源时使用，但事实并非如此
Reintegrate can only be used if revisions 4709 through 5019 were previously merged from http://subversion/svn/saxdev/trunk to the reintegrate source, but this is not the case
然后它列出了大约 50 个文件，描述如下:
It then listed around 50 files with descriptions such as this:
错误:branch/qst/kobalt/sax/businessobjects/util/HistoryParent.java
错误:缺少范围:/trunk/kobalt/sax/businessobjects/util/HistoryParent.java:4709-5018
修订版 5019 是主要修订版.修订版 4737 是我创建分支时的修订版.
Revision 5019 is the head revision.Revision 4737 was the revision when I created a branch.
我从 4737 版本的日志中得到了这个
I have this from the log for revision 4737
操作:添加路径:/branches/qst 从路径复制:/trunk
Action: Added Path: /branches/qst Copy from path: /trunk
对我来说，那个错误消息说分支不是最初来自主干，这不是真的.
To me, that error message says that the branch was not originally from trunk, which isn't true.
有什么想法吗?
推荐答案
如果您在一个分支上工作并且一直在与其他人的工作保持同步，那么当您创建主干的工作副本并尝试时，您可能会感到困惑如果您收到如下消息，请重新整合您的分支:
If you are working on a branch and have been keeping it up to date with others work you might be bemused when you create a working copy of the trunk and attempt to reintegrate your branch if you get a message something like this:
$ svn merge --reintegrate https://server.blah/source/orb/branches/bronze_services
svn: Reintegrate can only be used if revisions 650 through 694 were previously merged from
https://server.blah/source/orb/trunk to the reintegrate source, but this is not the
case:
branches/bronze_services/occl
Missing ranges: /trunk/occl:650-693
我在 Google 上看到了许多变通方法，但它们让我感到紧张，因为它们是黑客".为了解决这个问题，我决定做 subversion 在消息中暗示的事情.我回到我的分支并明确合并指定的修订:
I've seen a number of workarounds on Google but they made me nervous as 'hacks'. To address it I decided to do just what subversion is hinting at in the message. I went back to my branch and explicitly merged the specified revisions:
$ svn merge -r 650:693 https://server.blah/source/orb/trunk
$ svn commit -m 'merged revisions 650:693 from trunk'
Sending occl
Committed revision 695.
完成此操作后，我能够返回主干的工作副本并重新集成分支，没有任何问题.
Once I did this, I was able to return to the working copy of trunk and reintegrate the branch without any problems.
希望能帮到你
这篇关于仅当先前从 <URL> 合并修订版 X 到 Y 时，才能使用重新集成.重新整合源，但事实并非如此的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！