I was just trying to merge a feature branch back into the main dev branch on our work SVN server, whereupon I received the mighty unhelpful message “svn retrieval of mergeinfo unsupported by” followed by the path of my repo. With a bit of prodding around I noticed that I was able to use the “merge a range of revisions” option in TortoiseSVN, it was just the “reintegrate a branch” option that was failing. So by selecting the former option, then entering the URL for my branch, I was able to use the “show log” button to select all of the changes that I’d made to give me the revision range to merge and let SVN do it’s thing.
Our SVN server setup has a mix of a couple of old versions, whereas my client is on a flavour of 1.7, so this seems to be a mishmash between the 2. The workaround, whilst not as simple as the reintegrate option seemed to do the job fine. Hurrah.
The history of paleo soups diet is dependant on the food items
ReplyDeleteand ingredients that are NOT paleo soups friendly.
Here is my homepage: paleo brands