SVN 将整个文件标记为冲突 [英] SVN marks entire files as conflicted

问题描述

我是 SVN 的新手.在分支上工作了一天左右后，我尝试将更改从主干合并到分支:

I'm new to SVN. After working on a branch for a day or so, I attempted to merge changes from the trunk to the branch:

svn merge svn://server/trunk

问题在于，每当SVN遇到冲突文件时，它都无法识别逐行更改并将整行标记为冲突.我尝试了其他几个 SVN 客户端，并尝试在没有任何进展的情况下切换结束行和空白选项.我究竟做错了什么?我认为这是最简单的合并案例，所以我希望这适用于最默认的 Subversion 设置、任何客户端和任何 SVN 版本.这是一些已知的初学者捕获吗?

The problem is that whenever SVN encounters a conflicting file, it's not able to recognize line by line changes and marks the entire line as conflicted. I experimented with several other SVN clients and also tried to toggle the end-line and white-space options without any progress. What am I doing wrong? I think this is the simplest possible merge case, so I would expect this to work with the most default Subversion settings, any client and in any SVN version. Is it some known beginner's catch?

客户端:1.5.5 (SlikSvn:tag/1.5.5@34877) WIN32

Client: 1.5.5 (SlikSvn:tag/1.5.5@34877) WIN32

服务器:1.4.6 (r28521)，Windows

Server: 1.4.6 (r28521), Windows

编辑

根据下面评论和答案中的建议，我做了更多调查:

Based on the suggestions in comments and answers below, I did more investigation:

1. 有问题的文件是 UTF8.

1. The problematic files are UTF8.

他们没有任何 SVN 属性.

They don't have any SVN properties.

svn diff"命令正确识别差异.

The "svn diff" command correctly identifies the differences.

推荐答案

我们最近遇到了这个问题，发现它是使用 1.4.x 服务器和 1.5.x 客户端的问题.Subversion 1.5 引入了更智能的合并，但您需要运行 1.5 的服务器和客户端才能利用这一点.

We had this issue recently and found that it was a problem with using a 1.4.x server and a 1.5.x client. Subversion 1.5 introduced more intelligent merging but you need the server and client to be running 1.5 to take advantage of this.

我们发现指定我们想要合并的修订号范围会产生预期的结果.

We found that specifying the range of revision numbers that we wanted to merge gave the expected results.

这篇关于SVN 将整个文件标记为冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！