问题
I have an issue with a feature branch that I'm trying to merge to trunk
. The message that I'm getting is this:
➜ trunk svn merge https://svn.vcshost.org/svn/domaindev/branches/Master-Project/feature-branch
svn: E160013: '/svn/domaindev/!svn/bc/112033/trunk/Master-Project' path not found
Any help would be greatly appreciated. I tried merging from trunk
to this feature branch and it worked flawlessly, also merging other branches to trunk
works okay, so I'm guessing that there's a problem with this exact branch.
EDIT: I also tried merging using relative URLs but have encountered the same issue.
Thanks.
回答1:
Answer to my question was creating a fresh branch, checking it out locally, and copying the codebase from the faulty branch, except for the .svn
dirs. Commit, update, merge! Kept the faulty branch for its commit history.
来源:https://stackoverflow.com/questions/28873678/getting-svn-e160013-when-merging-from-command-line