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

svn tortoisesvn

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 branch. I chose "Reintegrate a branch" from Tortoise and received the following error message:

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

It then listed around 50 files with descriptions such as this:

Error: branches/qst/kobalt/sax/businessobjects/util/HistoryParent.java

Error: Missing ranges: /trunk/kobalt/sax/businessobjects/util/HistoryParent.java:4709-5018

Revision 5019 is the head revision. Revision 4737 was the revision when I created a branch.

I have this from the log for revision 4737

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.

Any ideas?

Okay. I don't really use Subversion anymore, but will take your word for it!

Thanks dude. I think the page is better for it.

Gray

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

Nice! "do just what subversion is hinting at in the message". :)

I agree, the more popular answer is tempting, but probably better to fix it correctly. I had to go to the specific problematic file and svn merge it from the trunk.

This worked great for me. The main trick was that Tortoise wasn't telling me the problem revision. After upgrading my command line svn client I was able to get it to give me a message like you have, and then was able to merge the problem revision and go back to the trunk.

This didn't work for me because the listed "missing" merges had already been done in the branch (reintegrate source).

While this answer sounds reasonable, it did not work for me. I kept getting the same error messages. What helped, was to remove the svn:mergeinfo properties from the listed files, just like the accepted answer is suggesting.

Gray

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

This really helped me solve my issue but mine was due to merging a revision from a child folder rather doing this on the root folder. My issue was - I had performed the merge but the root folder hadn't recognised that the merge had happened, this meant that I had to manually update the mergeinfo prop with the missing revision numbers. NOTE I could only do this because there were no other files changes for the revision and will cause unexpected behaviour if other files need to be merged - you will need to re-merge the revisions if this is the case.

In TortoiseSVN, you can right click the file, select "TortoiseSVN" --> "Properties" and Delete the svn:mergeinfo property.

@StephenKennedy You might be running into the problem of reusing a branch that's already been reintegrated. If so check out the last section of svnbook.red-bean.com/en/1.7/… starting with "Once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work."

+1. You don't need to delete all the mergeinfos; just the ones that have missing ranges. See my answer for a way to delete just the problem mergeinfos by filtering the TortoiseSVN error output.

-1. You should not be removing mergeinfo properties unless you are really sure about what you are doing. Lots of people may read this, delete these properties, and inadvertently introduce other problems. Paul Whipp has a better answer.

Community

If you try to reintegrate your branch to trunk and you see errors like this from TortoiseSVN:

https://i.imgur.com/MOtKx1f.png

Click on the error text and press CTRL + A, CTRL + C to copy all the text.

Paste the text into the here-string of this PowerShell script:

@"
Command: Reintegrate merge http://svn.cloudcorp.com/branches/myproject into C:\Users\iain\Documents\Repositories\CloudCorp\trunk  
Error: Reintegrate can only be used if revisions 18089 through 18612 were previously  
Error:  merged from http://svn.corp.skyscanner.local/svn/SkyScannerDatabase/trunk to  
Error:  the reintegrate source, but this is not the case:  
Error:    
Error:  branches/myproject/userdata/usermanagementservice  
Error:   
Error:     Missing ranges:  
Error:  /trunk/userdata/usermanagementservice:18365,18404  
Error:    
Error:  branches/myproject/userdata/auto_create_db.sql  
Error:   
Error:     Missing ranges:  
Error:  /trunk/userdata/auto_create_db.sql:18406  
Error:   
Error:    
Error:  branches/myproject/userdata/create_audit_tables_triggers_uds.sql  
Error:   
Error:     Missing ranges:  
Error:  /trunk/userdata/create_audit_tables_triggers_uds.sql:18406  
"@ -split "`n" |
? { $_ -match ('Error: +branches') } |
% { $_.Substring($_.IndexOf('userdata')) } |
% { "svn propdel svn:mergeinfo $_" }

The script extracts the relative paths of files with problem mergeinfo and outputs a list of commands to fix each one.

You may have to change the 'userdata' value to suit your repository structure.

Execute the script to output the commands you need to remove the problem mergeinfos.

In this example, the script would produce this output:

svn propdel svn:mergeinfo userdata/usermanagementservice  
svn propdel svn:mergeinfo userdata/auto_create_db.sql  
svn propdel svn:mergeinfo userdata/create_audit_tables_triggers_uds.sql

At the command prompt you can navigate to the branch base (myproject) and execute the commands to delete the problem mergeinfos.

You should see output like this:

property 'svn:mergeinfo' deleted from 'userdata\usermanagementservice'.
property 'svn:mergeinfo' deleted from 'userdata\auto_create_db.sql'.
property 'svn:mergeinfo' deleted from 'userdata\create_audit_tables_triggers_uds.sql'.

As in Gray's answer, now you should commit the changes to the branch and try to reintegrate again. This time it should work!

Long before reintegrating I did merge (not reintegrate) some changes to trunk from my branch because I accidentally committed to my branch when I meant to commit to trunk. Could it be the reason behind these reintegrate errors?

That's exactly what seems to have caused this problem in my case. Thanks for taking the time to write the script!

@Sam Glad you found it helpful. Did you need to replace the literal space with a \s+ to make it work for you?

Sort of; it was more the + that was needed for it to work for me. In my case, some lines had two spaces and others had three, so support for variable numbers of spaces was needed. I'm not sure why I changed the space to a \s; that probably wasn't needed, so sorry for that part!

@Sam No worries, but I'll change it back to a literal space for now until TortoiseSVN starts mixing it up with tabs or whatever :-) I've left the + since it was useful for you.

colinjwebb

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

This answer doesn't really explain what you did. No examples, not even a link to the requisite section of the manual.

In hindsight, no it doesn't. However, as this was my own answer on the same day as the question, it was the best answer for a few months. I'd like to presume it makes sense if you still use Tortoise SVN 1.6 though. I have accepted Gray's answer as the accepted answer now instead.

Example: svn merge ^/tags/w.x ^/tags/y.z . The reintegrate error popped up for me when using 1.8 and merging into the trunk where the merge source had had a specific revision previously merged into it from the trunk. 1.8 appeared to decide that a reintegrate merge was being attempted, which it wasn't. A dry-run merge with 1.6 would work fine, but the two URL merge fits too.

The precise scenario that failed with 1.8 was copying a tag from some revisions back for a patch release, cherry picking a change from the trunk to backport by a merge into the patched tag, making a further change to the patched tag, and merging that back into the trunk. The changes between the base tag and the patched version are what need to be merged back to the trunk, and a 2 URL merge works a treat for that.

I should have read this answer before spending 3 days trying to understand what was going on. I still don't understand why I have had this problem but suspect the comment from @Nick is the reason - and now things are working I'm not going to look any further...

Olga Perederieieva

https://i.stack.imgur.com/0kQDi.png

Thank you for such a basic idea. Of all the answers, this was not only the least complicated, but it was the only one that worked for me.

Farshid Eilami

Just do as SVN is telling you.

Merge the branch from the Reversion that SVN is telling you Reintegrate from Branch to trunk

Didn't work for me. The changes already existed in the branch. Your instructions look like they should work for some cases, but they seem to be based on an assumption, so they don't seem universal.

Community

See also my answer here for my experience with a similar case. I'm not sure if this is the source of your problem, but it does look like Subversion 1.8 has problems with the mergeinfo when two changes cancel each other.

John W

I got this error after using a partial checkout of a branch. I was keeping the branch up to date with the trunk but the trunk revisions for parts of the branch that were not checked out were of course not being updated. The fix was to do a full checkout of the branch and then merge in all of the trunk changes. After committing these to the branch I could merge the branch to the trunk successfully.

Akber Iqbal

Got this issue on

TortoiseSVN 1.9.7, Build 27907 - 64 Bit , 2017/08/08 19:34:38

Subversion 1.9.7, -release

apr 1.5.2

apr-util 1.5.4

serf 1.3.9

OpenSSL 1.0.2l 25 May 2017

zlib 1.2.8

SQLite 3.14.1

right click on the branch where you wish to merge (but getting this message) and select the option "update to revision" and then on the dialog which opens (screenshot below) select those revisions and click ok - once all previous revisions are merged, you wouldn't get this message

https://i.stack.imgur.com/uC41Q.png

Adding this here to help someone who is using Tortoise SVN

David Lublink

I ran into this issue. I did an SVN log on my branch to find were I had merged trunk to my branch.

I noted all the revisions.

I then did the merge of my branch to trunk by specifying the revisions manually. I specified all ranges to exclude the revisions were I merged trunk. I manage to get my branch merged.

I had to do some reverts on mergeinfo, but I got my code merged.

I immediately deleted my branch.

awan.soekamto

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.

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

Follow WeChat

Want to stay one step ahead of the latest teleworks?

相似问题

Platform

Support

Links

Contact US