svn - 没有服务器的SVN工作副本合并

Question

在 Subversion 中，如何在工作副本之间合并，从主干到分支，而不与服务器通信（两者都是最新版本，没有本地更改）。

Answer 1

Merging in Subversion means that you want to merge the changes from revision xyz to revision xyz + i on the branch branch_abc to the current state of the trunk. That means, that you are only able to do that, if you know the difference between xyz and xyz + i and that is only known to the server.

So, no, there is no way to do the merge only locally (without connection to the server).

Answer 2

从 svn-book 看起来你不能：

2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]

3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]

2. In the second form, the URLs corresponding to the source working copy paths define the sources to be compared. The revisions must be specified.

3. In the third form, SOURCE can be either a URL or a working copy path (in which case its corresponding URL is used).

文档说即使您引用磁盘上的副本，它仍然会尝试进入存储库。

我尝试按照您的建议进行合并（上面的第二种形式），并且在连接时可以正常工作，但是当我断开连接时：

dev_6 zyoung$ svn merge --reintegrate ../dev@11
svn: OPTIONS of 'http://foo.unfuddle.com/svn/foo_personal/dev': Could not resolve hostname `foo.unfuddle.com': Host not found (http://foo.unfuddle.com)

我希望这有帮助，