SVN合并可重新整合缺少的范围，但无法合并 [英] SVN merge reintegrate missing ranges but nothing to merge

问题描述

这是谜语:

C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone --dry-run
svn: E195016: Reintegrate can only be used if revisions 11430 through 12384 were previously merged from http://svn.e.com/repos/trunk to the reintegrate source, but this is not the case:
  branches/lih
    Missing ranges: /trunk:11902

但是如果我进入分支的目录并尝试合并该范围，则没有任何内容可以合并！

But then if I go into the branch's directory and try to merge that range, there is nothing to merge!

C:\code\branches\branch> svn merge -r 11901:11902 http://svn.e.com/repos/trunk --accept postpone --dry-run
C:\code\branches\branch>

即使svn merge -r 11898:11903也没有任何合并内容.

Even svn merge -r 11898:11903 shows nothing to merge.

现在，我似乎无法将我的分支重新整合到主干中！请帮忙！

Now I seem unable to reintegrate my branch into trunk! Please help!

P.S. lih分支直到11906年才创建.它是从hd分支分支出来的，而hd分支又是从树干分支出来的(而hd已被合并回树干).

P.S. The lih branch wasn't created until 11906. It was branched from the hd branch, which was branched from trunk (and hd has already been merged back into trunk).

推荐答案

这似乎对我有用，但我不能声称理解它或保证这是解决我的问题的最佳方法.

This seemed to work for me, but I can't claim to understand it or vouch that it's the best way to resolve my problem.

首先，重要的是您的分支具有对主干的所有最新提交.因此，将其同步(从主干到分支进行合并).

First, it's important that your branch has all the latest commits to trunk. So sync it up (do a merge from trunk to branch).

然后，您可以通过在trunk目录中执行以下操作来强制重新集成: svn merge http://svn.e.com/repos/trunk/@REV http://svn.e.com/repos/branches/lih/ . --dry-run(但将REV替换为最新的修订版号).

Then you can essentially force a reintegrate by doing this in the trunk directory: svn merge http://svn.e.com/repos/trunk/@REV http://svn.e.com/repos/branches/lih/ . --dry-run (but replace REV with the latest revision #).

这篇关于SVN合并可重新整合缺少的范围，但无法合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！