从命令行合并时获取`svn:E160013:` [英] Getting `svn: E160013:` when merging from command line

问题描述

我正在尝试合并到trunk的功能分支出现问题.我收到的消息是这样的:

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

➜ 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

任何帮助将不胜感激.我尝试从trunk合并到此功能分支，并且它完美无缺地工作了，而且将其他分支合并到trunk的工作也可以，所以我猜测这个确切的分支存在问题.

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.

我也尝试过使用相对URL进行合并，但是遇到了相同的问题.

I also tried merging using relative URLs but have encountered the same issue.

谢谢.

推荐答案

我的问题的答案是创建一个新分支，在本地对其进行检出，然后从错误的分支中复制代码库，但.svn dirs除外.提交，更新，合并！保留错误分支的提交历史记录.

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.

这篇关于从命令行合并时获取`svn:E160013:`的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！