Search code examples
svnmergebranching-and-mergingsvn-reintegrate

SVN merge reintegrate missing ranges but nothing to merge

Here is the riddle:

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>

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

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

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).

Solution

  • 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).

    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 #).