如何使用Android中使用的工作室SVN主干分支合并 [英] How to merge branch with trunk using SVN in android studio

问题描述

我想我犯的分支修改，并添加使用Android Studio中内置SVN工具主干版本这些变化。我该怎么办呢？

I would like to commit my changes in the branch and add those changes to the trunk version using the built-in svn tool in Android Studio. How can I do it?

我应该期待这种特性从这个内置的工具，或者我应该使用像TurtoiseSVN外部工具？

Should I expect this kind of feature from this built-in tool or should I use an external tool like TurtoiseSVN?

推荐答案

，因为它说的IntelliJ文件（Android的工作室和IntelliJ IDEA的来自同一code内置了Android插件）

As it says on this link of IntelliJ Doc (Android Studio and the Android plugin for IntelliJ IDEA are built from the same code)

要合并分支修改回主干，你应该打开后备箱的工作拷贝，并从后备箱取更改时到分支（弹出式窗口中选择源科）做相同的步骤。此外，您将被警告：

To merge branch changes back into trunk, you should open trunk working copy and do same steps as when taking changes from trunk into branch (selecting source branch in popup). Additionally, you will be warned:

合并信息收集规则
  为了能够在一堆合并更改回主干（使用Subversion--reintegrate），你不应该对其他目标完成的任何合并的工作拷贝的根，也就是你不应该有任何的svn：在工作集合并信息的属性复制子树。
  这就是为什么检查哪些修订是合并的，在默认情况下，当，IntelliJ IDEA的不检查一个子树合并信息。
  但是，如果你需要somewhy子树进行检查，你应该去设置|版本控制| VCSS |颠覆，并设置检查的svn：合并信息的目标子树时preparing为合并

Merge information gathering rules To be able to merge changes back to trunk in a bunch (using Subversion "--reintegrate"), you should NOT have any merges done on other target that working copy root, i.e. you should not have any svn:mergeinfo properties set in working copy subtree. That’s why when checking what revisions are merge, by default, IntelliJ IDEA would not check merge information in a subtree. But if you somewhy need subtree to be checked, you should go to "Settings | Version Control | VCSs | Subversion" and set "Check svn:mergeinfo in target subtree when preparing for merge".

更多信息和充分的文档可以位于： https://devnet.jetbrains.com/文档/ DOC-1203

More info and full doc can be located at: https://devnet.jetbrains.com/docs/DOC-1203

编辑：

应答到错误：SVN：E195016：合并跟踪不允许有缺失子树：

Answering to Error: svn: E195016: Merge tracking not allowed with missing subtrees:

当有人删除一些不使用的Subversion命令出现该错误。如果你要在该工作运行svn状态复制颠覆抱怨应该在输出的第一列以！显示相同的路径。尝试使用 SVN RM 而不是操作系统命令。

That error occurs when someone deletes something without using Subversion commands. If you were to run svn status on that working copy the same path that Subversion is complaining about should show with a ! in the first column of the output. Try using svn rm instead of OS commands.

这篇关于如何使用Android中使用的工作室SVN主干分支合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！