颠覆性:svn:E195016:无法合并到具有切换子树的工作副本中 [英] Subversive: svn: E195016: Cannot merge into a working copy with a switched subtree

问题描述

我在使用 Eclipse 和 Subversive 时遇到问题.

I have an issue with Eclipse and Subversive.

我正在尝试将项目的一个分支重新集成到主干中.

I'm trying to reintegrate a branch of a project into the trunk.

这些是我正在关注的操作:

These are the operations that I'm following:

1. 切换到项目的主干版本
2. 我确保没有任何挂起的操作，执行恢复和更新，以便从干净"的工作副本开始，与主干的远程副本完美同步
3. 我转到团队 -> 合并..."
4. 我转到重新集成"选项卡，然后选择要在主干中合并的分支，指向该分支的头部修订版".
5. 我按下了确定按钮，但这是我获得的错误:

<小时>

 Merge operation failed.
Can't overwrite cause with org.tmatesoft.svn.core.SVNException: svn: E195016:
Cannot merge into a working copy with a switched subtree

我不明白出了什么问题.

I don't understand what's wrong.

我正在使用这个 Eclipse 和 SVN 配置:

I'm using this Eclipse and SVN configuration:

Eclipse Java EE IDE for Web Developers.
Version: Neon.1 Release (4.6.1)
Build id: 20160913-0900

Subversive SVN Team Provider    4.0.3.I20161129-1700    

SVNKit 1.8.14 Implementation (Optional) 6.0.3.I20161124-1700

SVN 1.9

提前致谢.

推荐答案

我不知道为什么会出现这个问题，但我注意到如果我们在分支之间执行一些切换"操作之前 合并操作.

I don't know exactly why there is this issue, but I noticed that it occurs if we perform some "switch" operations between branches before the Merge operation.

出于某些原因，在这种情况下会避免执行合并操作.

For some reasons, in this situation it's avoided to perform a merge operation.

我发现的解决方法"是在主干的干净副本上执行合并操作，在主干的 SVN 检出后，不进行任何切换操作.

The "workaround" that I have found is to perform the merge operation on a clean copy of the trunk, after the SVN checkout of the trunk, without make any switch operation.

这样，错误就不会再发生了.

In this way, the error doesn't occurs any more.

这不是一个实用的解决方案，但它有效.

It's not a practical solution, but it works.

这篇关于颠覆性:svn:E195016:无法合并到具有切换子树的工作副本中的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！