|
|
478.
|
|
|
Invalid mergeinfo detected on merge target '%s', merge tracking not possible
|
|
|
|
|
在合并目标“%s”发现了非法的合并信息；合并跟踪是不可能的
|
|
Translated by
Adam Conrad
|
|
|
|
Located in
../libsvn_client/merge.c:7505
|
|
|
479.
|
|
|
Use of two URLs is not compatible with mergeinfo modification
|
|
|
|
|
使用两个 URL 与合并信息修改不兼容
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:7361
|
|
|
480.
|
|
|
Merge from foreign repository is not compatible with mergeinfo modification
|
|
|
|
|
从外部版本库合并与合并信息修改不兼容
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:7368 ../libsvn_client/merge.c:7613
|
|
|
481.
|
|
|
Merge target '%s' does not exist in the working copy
|
|
|
|
|
合并目标 “%s” 不在工作副本中
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:10258 ../libsvn_client/merge.c:10401
|
|
|
482.
|
|
|
Cannot determine revision of working copy
|
|
|
|
|
不能确定工作副本的版本
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:7974
|
|
|
483.
|
|
|
Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first
|
|
|
|
|
不能合并到有混合版本的工作副本 [%ld:%ld] 中；请先更新
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:10287
|
|
|
484.
|
|
|
Cannot merge into a working copy with a switched subtree
|
|
|
|
|
不能合并到已经切换子目录的工作副本中
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:10302
|
|
|
485.
|
|
|
Cannot merge into a working copy that has local modifications
|
|
|
|
|
不能合并到有本地修改的工作副本中
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:10318
|
|
|
486.
|
|
|
Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
../libsvn_client/merge.c:10338 ../svn/merge-cmd.c:56
|
|
|
487.
|
|
|
Merge sources must both be either paths or URLs
|
|
|
|
|
合并源必须同时是路径或 URL
|
|
Translated by
Subversion Developers
|
|
|
|
Located in
../libsvn_client/merge.c:10656 ../svn/merge-cmd.c:123
|
