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