我遇到了一些对我来说奇怪的区别,即合并和仅记录合并...
svn merge "^/branches/release-8.0" .
--- Merging r22415 through r22446 into '.':
G .
--- Recording mergeinfo for merge of r22415 through r22446 into '.':
U .
... revert ...
svn merge --record-only "^/branches/release-8.0" .
--- Merging r2 through r22414 into '.':
G .
--- Merging r22415 through r22446 into '.':
G .
--- Recording mergeinfo for merge of r22415 through r22446 into '.':
G .
在第二个案例中,执行了通过r2到r22414的合并操作,这是意料之外的。它需要约5分钟,所以我一开始认为它挂了。(第一次合并只需要2-3秒。)
合并信息:
trunk:
svn pg svn:mergeinfo
<empty>
branch
svn pg svn:mergeinfo
/trunk:22415-22439
我不知道哪些额外的信息可以帮助,因为在测试样例中它没有被复现。
Subversion 1.7:
svn, version 1.7.10 (r1485443)
compiled Jun 1 2013, 09:36:13
也许有些猜测吗?