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