0

我看过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 是否确实被合并了？它发生得很快，所以我认为什么也没发生。

一些建议有一个 Temp RC 分支，并合并到 Temp 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 信息网址：

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'
4

1 回答 1

0
  1. 您必须使用普通合并（从 1-st 形式svn help merge）
  2. 我不知道任何合并-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
于 2013-07-07T13:33:20.543 回答