我目前在基石中的“重新集成分支”选项方面遇到问题。我收到一条错误消息“Description 'https://[email protected]/svn/sample/trunk/MyProject@27' 必须与 'https://[电子邮件受保护]/svn/sample/branches/MyProject%201.0@27'"。
我在一个分支“branch/MyProject 1.0”中，我试图通过将其放在“合并自”字段中来提交“trunk/MyProject”。
如果我尝试将其重新集成到我的主分支，它会成功完成，但即使在我提交之后它也不会执行任何操作。即使在提交后，主分支上的修订号也没有反映我正在使用的修订号。
谁能告诉我我做错了什么？
这是我的存储库结构
branch/MyProject（来自trunk/的直接分支，而不是trunk/MyProject）
branch/MyProject 1.0（来自branch/MyProject的分支）
trunk/MyProject
I'm currently having problems with the "reintegrate branch" option in cornerstone. I'm getting an error which says "Description 'https://[email protected]/svn/sample/trunk/MyProject@27' must be ancestrally related to 'https://[email protected]/svn/sample/branches/MyProject%201.0@27'".
I'm in a branch "branch/MyProject 1.0" and I'm trying to commit to "trunk/MyProject" by putting it in the "Merge from" field.
If I try to reintegrate it to my main branch, it successfully finishes but it doesn't do anything even after I commit it. The revision number on the main branch isn't reflecting the revision number I'm using even after commit.
Can anyone tell me what I'm doing wrong?
Here's my repository structure
branch/MyProject (direct branch from trunk/, not trunk/MyProject)
branch/MyProject 1.0 (branch from branch/MyProject)
trunk/MyProject
发布评论
评论（1）
似乎
branch/MyProject 1.0不是从branch/MyProject复制的。或者可能由于某种原因没有记录复制信息。
尝试在
branch/MyProject 1.0工作副本上运行svn log -v以查看它是否确实是从branch/MyProject复制的。也许是从其他地方复制的。您也可以尝试在没有合并历史记录的情况下进行合并：
svn merge --ignore-ancestry。它可能会产生您需要手动解决的冲突。顺便说一句，我会避免在文件夹名称中使用空格和点。只是为了降低某些东西因此而无法工作的风险。
另请参阅类似问题。
Seems like
branch/MyProject 1.0was not copied frombranch/MyProject.Or maybe the copy-from information was not recorded for some reason.
Try to run
svn log -vonbranch/MyProject 1.0working copy to see if it was really copied frombranch/MyProject. Maybe it was copied from another place.Also you can try to merge without merge history:
svn merge --ignore-ancestry. It may produce conflicts that you'll need to resolve manually.BTW, I would keep from using of spaces and dots in the folders names. Simply to reduce the risk something will not work because of it.
Also see similar question.