Reintegrate can only be used if revisions X through Y were previously merged from to reintegrate the source, but this is not the case

Question

Been using SVN branches with Tortoise 1.6. I\'ve been periodically merging the trunk into the branch to keep it up to date.

Today, I thought I\'d reintegrate the br

Answer 1

Actually I fixed it using the "merge two different branches" option to merge the trunk and the branch into my working copy. Then I committed that to the trunk.

Marvellous

Answer 2

[[ Although my solution has worked for me in the past, it can lead to improper results with modern SVN clients. In our case the merge errors seemed to be byproducts of automations that were confusing our SVN history and not real activity. I'm leaving this here for posterity but please consider the accepted answer instead. ]]

The solution for me was to remove any svn:mergeinfo properties that somehow get attached to individual files in the hierarchy.

svn merge --reintegrate svn+ssh://svn/usr/local/svn/repos/all/trunk 
svn: Reintegrate can only be used if revisions 18765 through 18921 were
    previously merged from svn+ssh://svn/usr/local/svn/repos/all/trunk to the
    reintegrate source, but this is not the case:
trunk/proj/src/main/java/com/foo/furniture.java
Missing ranges: /trunk/proj/src/main/java/com/foo/furniture.java:18765-18920

To find the files with mergeinfo information you can do:

cd ~/svn/branches/2.7
svn propget -R svn:mergeinfo .

Then you can remove the mergeinfo properties:

svn propdel svn:mergeinfo proj/src/main/java/com/foo/furniture.java ...
svn commit -m 'removed mergeinfo' proj/src/main/java/com/foo/furniture.java ...

After I completed this, my merge executed fine.

Answer 3

Something that worked for me in tortoise SVN: instead of merging all revisions from branch, choose specific range and manually select all your revisions from the branch.

Answer 4

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

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.

I hope this helps

Answer 5

I know this is an old post, but I was struggling to solve this issue as well until I found out that the files listed in the error message have SVN property issue.

I did right click on the troubled files: TortoiseSVN > Properties, and found that the file had two svn:mergeinfo, and one of them didn't have inherited from data. So I removed that mergeinfo.

I use TortoiseSVN 1.12.2, Build 28653 - 64 Bit.