如何将SVN从trunk更改为范围内的分支

Question

假设我检查了trunk,我是本地机器中trunk目录的根目录,我想将对trunk(范围62-65)所做的更改合并到一个分支.我检查了主干并做了svn up并运行这个合并cmd.

svn merge -r 62-65 svn+ssh://url/to/branch

它运行正常,但结果是错误的.我运行svn diff看到那些更改,并发现一个日志说我指定的范围应用于分支.

Merged /trunk/MyApp:r12-15
Merged /branch:r62-65

我试图做的是从62-65范围内的本地机器中的主干中取出那些更改,并将这些更改应用到我指定的分支.

我该怎么做呢？

Answer 1

1) use svn switch to go to branch
2) svn mergeinfo --show-revs eligible "url_to_trunk"  (it will show eligible revisions)
3) svn merge --dry-run -r 74299:74493 "url_to_trunk" (dry run is used to see what will happen after marge i.e., if any conflict or not. here merged from rev 74299 to rev 74493)
4) svn merge -r 74299:74493 "url_to_trunk" (finally merge)
5) svn commit (if expected result, commit merged files to branch)

Answer 2

要将一系列修订从trunk合并到一个分支上,您需要检出分支,而不是trunk.

从工作副本的根目录执行以下操作:

svn sw url/to/branches/branch
svn merge -r 62:65 url/to/trunk

...然后修复任何合并冲突,审核并提交,如果你很高兴.