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

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.