This is another descriptive error message from SVN. “Retrieval of mergeinfo unsupported”
If you’re seeing this error message you’re probably trying to use the reintegrate merger feature in SVN. You probably just used a command like this one:
svn merge --reintegrate svn://foobranch .
This error is caused by a configuration issue on your server, or a significant version mismatch between your client and server. It’s OK, though, this can be worked around pretty easily. Just fall back to the more reliable SVN 1.4 style explicit merger technique.
To use this approach you’ll need to know what revision you either created your branch from, or, if you’ve merged the trunk into your branch since creation, the revision you last merged into your branch. In this example, that revision is revision 42 (being the answer to the ultimate question)
svn merge svn://trunk@42 svn://foobranch .
Another option is to do an explicit revision to revision merger. This more low level syntax can be used for all sorts of crazy mergers including roll-backs and nonsensical mergers that will mess up your code. For this command you’ll need the revision from which you’d like to start your merger and the end revision. In this case I’ll be merging revisions 42 to 87. I’ll be merging these changes from the trunk to my current local path.
svn merge -r42:87 svn://trunk ./
In the explicit merger technique example I'm assuming that the pwd is your local wc of the trunk? And then the first two parameters could be, say, sourceforge.net URLs?
As far as knowing the revision last merged into my branch I guess I could just record the revision number from the last time I merged into my branch?
Kinda new to svn, and very stuck! Thanks for the help.
shawno
Hey Shawno,
Yes, you will run this command from the place you'd like to do the merge (most likely your checked out trunk directory) and the two parameters are indeed URLs to your repository, which may well be sourceforge.net URLs.
You can either record the revision post-it note style, or if it's too late for that it's pretty easy to review the commits to the repo and find the revision from which you've made your branch. Just use the command 'svn log' to list recent commits.
Cheers,
Mike