SVN:分支和重新集成不适用于更新的服务器 [英] SVN: Branch and reintegrate is not working with updated server

问题描述

我正在使用最近升级到 1.7 版的 Subversion 服务器.我使用的是命令行 Linux 客户端 1.7.10.

I am working with a Subversion server that was recently upgraded to version 1.7. I am using the command-line Linux client 1.7.10.

我创建了一个这样的分支:

I created a branch like this:

%: svn copy svn+ssh://acme.com/a/b/c/trunk svn+ssh://acme.com/a/b/c/branches/ovm_sequencer -m "Featureovm_sequencer 的分支"

经过几次编辑后，我尝试重新集成到后备箱中，但遇到了问题:

After a couple of edits, I tried to reintegrate into the trunk and only ran into problems:

%: svn merge --reintegrate '^/c/branches/ovm_sequencer'
svn: E160013: File not found: revision 1677, path '/c/branches/ovm_sequencer'

%: svn merge --reintegrate svn+ssh://acme.com/a/b/c/branches/ovm_sequencer
svn: E200007: Retrieval of mergeinfo unsupported by 'svn+ssh://acme.com/a/b/c/branches/ovm_sequencer'

出了什么问题，如何修复?

What has gone wrong and how can it be fixed?

推荐答案

两个注意事项:

• ^ 在 SVN-path 中意味着总是 repository-root，因此 ^/c/branches/ovm_sequencer 意味着 "/c/branches/ovm_sequencer"内部存储库，而您(很可能)在 acme.com/a/b/c 路径中有存储库，并且 URL 必须是 ^/branches/ovm_sequencer

• ^ in SVN-path means always repository-root, thus ^/c/branches/ovm_sequencer implies "/c/branches/ovm_sequencer" inside repository, while you have (most probably) repository in acme.com/a/b/c path, and URL must be ^/branches/ovm_sequencer

不支持检索合并信息"意味着关于您的 Network|SVN 管理员的一个坏事实 - 他没有阅读更新软件的发行说明:为了在服务器端支持合并信息，除了更新 1.5 之前的软件Subversion 到 1.5 或更高版本，存储库也必须升级以获得新格式.Collabnet 上的主题(非常古老 - 从 2008 年开始)"mergeinfo不支持"

"Retrieval of mergeinfo unsupported" means one bad fact about your Network|SVN admin - he doesn't read Release Notes for updated software: in order to have mergeinfo supported on server side except updating software for pre-1.5 Subversion to 1.5 or later, repository also must to be upgraded in order to have new format. Topic (very old - from 2008 year) on Collabnet "mergeinfo not supported"

这篇关于SVN:分支和重新集成不适用于更新的服务器的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！