在SVN中将分支与外部重新集成失败 [英] Reintegrate a branch with externals fails in SVN

问题描述

我在做什么:

1. 将外部属性应用于主干中的文件夹(单个文件和外部文件夹，外部均为二进制文件)

1. Apply external properties to a folder in the trunk (both single file and folder external, externals are binary files)

从主干创建分支并更新整个项目

Create a branch from the trunk and update the entire project

修改分支上的文件并提交更改，然后更新整个项目.

Modify a file on the branch and commit the changes, then update the entire project.

合并->当进入最后一个屏幕时，单击重新合并分支"，然后单击测试合并"，并显示此错误:

Merge -> "Reintegrate a branch" when I get to the last screen I click "test merge" and get this error:

错误:无法重新集成到混合修订版工作副本中；尝试先更新

Error: Cannot reintegrate into mixed-revision working copy; try updating first

我更新了整个项目，并且仍然存在相同的错误.

I update the entire project and still the same error.

其他观察结果:

• 如果我合并一系列修订"，则一切正常.
• 如果我删除外部组件，则可以使用合并一系列修订版本"或重新集成分支机构"来正常工作.

我该如何解决这个问题?

How do I solve this issue?

我正在将Subversion 1.6.6与 TortoiseSVN 1.6.6.一起使用.

I am using Subversion 1.6.6 with TortoiseSVN 1.6.6.

推荐答案

每次提交时都会发生混合修订"状态.当您进行更新时，它会消失.

The "mixed revision" state happen every time you do a commit. It disappears when you do an update.

执行merge --reintegrate时，必须从中继线结帐中执行命令 .

When doing a merge --reintegrate, you must execute the command from a trunk checkout.

因此，混合修订"消息很可能表示 trunk 结帐处于混合修订"状态，而不是您要重新集成的分支.

So the message "mixed revision" is most likely saying that the trunk checkout is in "mixed revision" state, not the branch you are trying to reintegrate.

这与您说自己刚刚在行李箱中犯了什么时提供的信息一致.

This is consistent with the information you give when saying you just commited something in the trunk.

在您的中继中执行 update (TortoiseSVN使用的中继结帐)，应该没问题.

Do an update in your trunk (the trunk checkout that TortoiseSVN uses), and it should be OK.

我遇到了同样的问题，并且不立即理解是混合版本( )中的主干，而不是我的分支.

I had the same problem and didn't understand immediately that it was the trunk which was in mixed revision, not my branch.

这篇关于在SVN中将分支与外部重新集成失败的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！