如何合并两个subversion分支(合并分支7.3到分支RC )

Question

我已经研究了svnmerge和常规svn，但说明要么涉及合并分支到主干，要么步骤不同。

下面是我所做的，就svnmerge.py而言

mkdir MERGE
cd MERGE
svn co https://svn.hq.cod.corp/co/perlapp/branches/RC
cd RC-MOVEAPRIL13-1
svnmerge.py init

cd ..
svnmerge merge https://svn.hq.co.corp/co/perlapp/branches/7.3
Nothing happened

then:
cd MERGE/RC
svn merge -S https://svn.hq.co.corp/co/perlapp/branches/7.3

现在，我怎么知道7.3是否真的被合并了？事情发生得太快了，所以我想什么也没发生。

一些建议是有一个临时RC分支，并合并到临时RC分支，而不是真正的目标RC分支。

另一种方式，似乎是：

$ svn co https://svn.hq.cod.corp/co/perlapp/branches/RC
$ cd RC
$ svn merge --ignore-ancestry https://svn.hq.cod.corp/co/perlapp/branches/RC https://svn.hq.co.corp/co/perlapp/branches/7.3 .
# Check the diff to see if it merged properly
$ svn diff | less

我还没试过

另外：

svn merge -dry-run -r 221381:259009 https://svn.hq.co.corp/co/perlapp/branches/7.3 https://svn.hq.cod.corp/co/perlapp/branches/RC给出错误：

svn:有关详细信息，请尝试使用“”svn help“”svn:无法使用两个URL指定修订范围

请记住，我希望从"7.3“分支合并到" RC”分支，最终结果是RC包含对"7.3“的所有提交。

svn信息URL：

kahmed@cr23788-kahmed:/media/Hitachi/3/SVN-MERGE-7.3_to_RC/RC$ 
kahmed@cr23788-kahmed:/media/Hitachi/3/SVN-MERGE-7.3_to_RC/RC$ svn info https://svn.hq.co.corp/co/perlapp/branches/build_7.3
Path: build_7.3
URL: https://svn.hq.co.corp/co/perlapp/branches/build_7.3
Repository Root: https://svn.hq.co.corp/co
Repository UUID: 1a64bf25-e0e5-0310-b6f3-de1d3c99dda3
Revision: 259054
Node Kind: directory
Last Changed Author: mk
Last Changed Rev: 259009
Last Changed Date: 2013-07-05 11:45:26 -0400 (Fri, 05 Jul 2013)

kahmed@cr23788-kahmed:/media/Hitachi/3/SVN-MERGE-7.3_to_RC/RC$ svn info https://svn.hq.co.corp/co/perlapp/branches/RC
Path: RC
URL: https://svn.hq.co.corp/co/perlapp/branches/RC
Repository Root: https://svn.hq.co.corp/co
Repository UUID: 1a64bf25-e0e5-0310-b6f3-de1d3c99dda3
Revision: 259054
Node Kind: directory
Last Changed Author: jc
Last Changed Rev: 259052
Last Changed Date: 2013-07-08 06:58:02 -0400 (Mon, 08 Jul 2013)

kahmed@cr23788-kahmed:/media/Hitachi/3/SVN-MERGE-7.3_to_RC/RC$ svn merge --dry-run http://svn.hq.co.corp/co/perlapp/branches/build_7.3
svn: 'https://svn.hq.co.corp/co/perlapp/branches/RC' isn't in the same repository as 'http://svn.hq.co.corp/co'

Answer 1

合并时，您必须使用普通的合并( svn help merge)

• I中的第1个表单不知道-S的选项

通用模式

mkdir RC
cd RC
svn co https://svn.hq.cod.corp/co/perlapp/branches/RC
svn merge --dry-run https://svn.hq.co.corp/co/perlapp/branches/7.3

(检查结果，在“树冲突”的情况下更多地考虑解决问题，在“冲突”的情况下进行预合并选择正确的版本或在GUI样式中合并以解决冲突的可视化合并)

还有..。

svn merge https://svn.hq.co.corp/co/perlapp/branches/7.3