Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5
We struggled with this issue for few weeks and we finally got it solved.
In our case, we worked on a branch that was merged with all trunk revisions on a daily basis. When we tried to reintegrate it (merge back to trunk) we got this error. When we tried to merge the missing ranges to our branch we got message that there is nothing to merge. It happened in several unrelated branches and with different files and folders.
The solution was to add the missing ranges to the svn:mergeinfo property of the file or folder in our branch.
For each "Missing ranges: path:revision_range" line in the message you got:
- Edit the svn:mergeinfo property in file/folder mentioned in in the merged branch
- Append the following : string at the end of the property value (e.g. /trunk/images/test:280-324)
- Save the SVN property
Commit all changes and reintegrate again
You have to merge the revisions r280 to r324 from trunk into your branch first.
It seems you already merged r325 into your branch, however --reintegrate needs to get all revisions up to your latest revision merged. There must be no gap. So here a little Diag:
+----------------------> /branches/devel
/ / \<--merge not working!
--------/-------+--+---+-----+---------> trunk
| \ | / |
280 \ V / 325
V
missing sync merges from trunk to branch
I think this is your branch structure, so you need to sync all changes from trunk to your branch. You only merged r325, so just merge r280-r324 and after doing this you should be fine to use --reintegrate
I had this issue, and it was ultimately caused by the erroneous SVN properties against a folder in my branch.
The solution was easy - I merged from trunk to my branch using the specific revision number that had been reported as missing e.g.
And then specifying to only record the merge e.g.
This action correctly brought my branch into line with trunk, and my subsequent branch reintegration into trunk worked successfully, without the missing ranges error message.
This technique avoided any manual editing of any svn:mergeinfo properties against any files/folders.