颠覆合并-“具有与...不同的存储库根" [英] subversion merge - "has different repository root than"
问题描述
我正在使用Subversion进行一个相对较新的项目.我已经分支了几次，并且毫无问题地将该分支合并回了主干.但是，我最近的合并失败了-这似乎与以下事实有关:我向中继上尚不存在的分支中添加了一个新文件(在本例中为GradientView.h).
I'm working on a relatively new project using Subversion. I've already branched off a couple of times and merged that branch back to trunk with no problems. However, my latest merge is failing - and it seems to be tied into the fact that I added a new file to the branch that does not yet exist on the trunk (in this case, GradientView.h).
这是我尝试从命令行进行合并时看到的内容:
Here's what I saw when I tried to merge from the command line:
bpapa@mycompany$ svn --username bpapa --password mypassword merge -r 177:HEAD svn://mycompany.server/opt/my-svn-repository/myproject/branches/version-1.4
C Classes/MyAppDelegate.m
svn: Copyfrom-url 'svn://mycompany.server/opt/my-svn-repository/myproject/branches/version-1.4/Classes/GradientView.h' has different repository root than 'svn://bpapa@mycompany.server'
如果我在工作副本中查找.svn目录，并仔细检查"entries"文件，请检查存储库URL是否正确-svn://bpapa@mycompany.server/opt/my-svn-repository /myproject/trunk
If I look the .svn directory in my working copy and check the "entries" file as a sanity check the repository URL seems to be right - svn://bpapa@mycompany.server/opt/my-svn-repository/myproject/trunk
如果需要帮助，还要注意的另一件事是我希望合并更多文件.似乎合并了第一个文件(MyAppDelegate)，然后当它到达新文件GradientView.h时，它会窒息.
Another thing to note, if it it helps, is that I was expecting many more files to get merged. It seems to merge the first file (MyAppDelegate), then when it gets to the new file, GradientView.h, it chokes.
推荐答案
您正在使用不匹配的合并URL:
You are using a non-matching merge URL:
svn://mycompany.server
vs.
svn://bpapa@mycompany.server
尝试:
svn --password mypassword merge -r 177:HEAD svn://bpapa@mycompany.server/opt/my-svn-repository/myproject/branches/version-1.4
这篇关于颠覆合并-“具有与...不同的存储库根"的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
