Path not found on merge

Last week we merged our production branch into the open issue branches we have. There were no conflicts and only a few files changed in most cases.

Today after changes in two of the open branches, I copied the production branch to a new Next Release branch, checked it out to my local machine, then attempted to merge the two open branches into the local copy. The test merge listed a number of tree conflicts and other potential conflicts, and when I try to do an actual merge it transfers some data then gives a path not found error with a revision number in the form:

'svn/[repository name]/!svn/rvr/[revision number]/[path to branch]' path not found

Another user working from a different location is experiencing the same issue. I and my colleague googled and tried several suggestions like clearing cached repositories and other saved date, no difference.

We re-merged the production branch into one of the open branches and it said it updated a property but made no changes to the file content. We then re-copied the production branch to a new branch and tried to merge that open branch into it and still got the error.

My colleague right now is looking into updating the TortoiseSVN server component, I'm at a loss as to what to try. Any input would be greatly appreciated.

Thanks!

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3111110

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-07 01:21:04 CEST